diff options
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 129 |
1 files changed, 0 insertions, 129 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index c62bf1e622a..58ec1da1ec9 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -565,15 +565,6 @@ Resolver::operator()(const Ice::StringSeq& values, const string& name) const return result; } -DistributionDescriptor -Resolver::operator()(const DistributionDescriptor& desc) const -{ - DistributionDescriptor result; - result.icepatch = operator()(desc.icepatch, "IcePatch2 server proxy"); - result.directories = operator()(desc.directories, "distribution source directory"); - return result; -} - PropertyDescriptorSeq Resolver::operator()(const PropertyDescriptorSeq& properties, const string& name) const { @@ -1019,8 +1010,6 @@ Resolver::getReserved() reserved["node.datadir"] = ""; reserved["node.data"] = ""; reserved["session.id"] = ""; - reserved["application.distrib"] = "${node.data}/distrib/${application}"; - reserved["server.distrib"] = "${node.data}/servers/${server}/distrib"; reserved["server"] = ""; reserved["server.data"] = "${node.data}/servers/${server}/data"; reserved["service"] = ""; @@ -1523,11 +1512,6 @@ ServerHelper::operator==(const CommunicatorHelper& h) const return false; } - if(_desc->distrib != helper->_desc->distrib) - { - return false; - } - if(_desc->allocatable != helper->_desc->allocatable) { return false; @@ -1624,10 +1608,6 @@ ServerHelper::printImpl(const Ice::CommunicatorPtr& communicator, Output& out, c { out << nl << "user = `" << _desc->user << "'"; } - if(!_desc->applicationDistrib) - { - out << nl << "application distribution = `false'"; - } if(!_desc->options.empty()) { out << nl << "options = `" << toString(_desc->options) << "'"; @@ -1636,17 +1616,6 @@ ServerHelper::printImpl(const Ice::CommunicatorPtr& communicator, Output& out, c { out << nl << "envs = `" << toString(_desc->envs) << "'"; } - if(!_desc->distrib.icepatch.empty()) - { - out << nl << "distribution"; - out << sb; - out << nl << "proxy = `" << _desc->distrib.icepatch << "'"; - if(!_desc->distrib.directories.empty()) - { - out << nl << "directories = `" << toString(_desc->distrib.directories) << "'"; - } - out << eb; - } CommunicatorHelper::print(communicator, out); } @@ -1662,7 +1631,6 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance, instance->iceVersion = resolve(_desc->iceVersion, "ice version"); instance->pwd = resolve(_desc->pwd, "working directory path"); instance->activation = resolve(_desc->activation, "activation"); - instance->applicationDistrib = _desc->applicationDistrib; instance->allocatable = _desc->allocatable; instance->user = resolve(_desc->user, "user"); if(!instance->activation.empty() && @@ -1677,7 +1645,6 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance, instance->deactivationTimeout = resolve.asInt(_desc->deactivationTimeout, "deactivation timeout"); instance->options = resolve(_desc->options, "option"); instance->envs = resolve(_desc->envs, "environment variable"); - instance->distrib = resolve(_desc->distrib); instance->propertySet.properties.insert(instance->propertySet.properties.end(), props.begin(), props.end()); } @@ -2444,52 +2411,6 @@ NodeHelper::getServerInfos(const string& app, const string& uuid, int revision, } bool -NodeHelper::hasDistributions(const string& server) const -{ - assert(_instantiated); - - // - // Get the server distributions to patch. - // - if(server.empty()) - { - for(ServerInstanceHelperDict::const_iterator p = _serverInstances.begin(); p != _serverInstances.end(); ++p) - { - if(!p->second.getServerInstance()->distrib.icepatch.empty()) - { - return true; - } - } - for(ServerInstanceHelperDict::const_iterator p = _servers.begin(); p != _servers.end(); ++p) - { - if(!p->second.getServerInstance()->distrib.icepatch.empty()) - { - return true; - } - } - } - else - { - ServerInstanceHelperDict::const_iterator p = _serverInstances.find(server); - if(p == _serverInstances.end()) - { - p = _servers.find(server); - if(p == _servers.end()) - { - return false; - } - } - - if(!p->second.getServerInstance()->distrib.icepatch.empty()) - { - return true; - } - } - - return false; -} - -bool NodeHelper::hasServers() const { return !_serverInstances.empty() || !_servers.empty(); @@ -2673,7 +2594,6 @@ ApplicationHelper::ApplicationHelper(const Ice::CommunicatorPtr& communicator, _instance.serverTemplates = _def.serverTemplates; _instance.serviceTemplates = _def.serviceTemplates; _instance.description = resolve(_def.description, "description"); - _instance.distrib = resolve(_def.distrib); _instance.propertySets = resolve(_def.propertySets); for(ReplicaGroupDescriptorSeq::iterator r = _def.replicaGroups.begin(); r != _def.replicaGroups.end(); ++r) @@ -2806,11 +2726,6 @@ ApplicationHelper::diff(const ApplicationHelper& helper) const updt.propertySets = getDictUpdatedElts(helper._def.propertySets, _def.propertySets); updt.removePropertySets = getDictRemovedElts(helper._def.propertySets, _def.propertySets); - if(_def.distrib != helper._def.distrib) - { - updt.distrib = new BoxedDistributionDescriptor(_def.distrib); - } - GetReplicaGroupId rk; ReplicaGroupEq req; updt.replicaGroups = getSeqUpdatedEltsWithEq(helper._def.replicaGroups, _def.replicaGroups, rk, req); @@ -2856,7 +2771,6 @@ ApplicationHelper::update(const ApplicationUpdateDescriptor& updt) const def.name = _def.name; def.description = updt.description ? updt.description->value : _def.description; - def.distrib = updt.distrib ? updt.distrib->value : _def.distrib; def.replicaGroups = updateSeqElts(_def.replicaGroups, updt.replicaGroups, updt.removeReplicaGroups, rg); def.variables = updateDictElts(_def.variables, updt.variables, updt.removeVariables); def.propertySets = updateDictElts(_def.propertySets, updt.propertySets, updt.removePropertySets); @@ -3007,32 +2921,6 @@ ApplicationHelper::getServerInfos(const string& uuid, int revision) const } void -ApplicationHelper::getDistributions(DistributionDescriptor& distribution, - vector<string>& nodes, - const string& server) const -{ - assert(!_instance.name.empty()); - - distribution = _instance.distrib; - for(NodeHelperDict::const_iterator n = _nodes.begin(); n != _nodes.end(); ++n) - { - if(n->second.hasDistributions(server)) - { - nodes.push_back(n->first); - if(!server.empty()) - { - break; - } - } - else if(!_instance.distrib.icepatch.empty() && - ((server.empty() && n->second.hasServers()) || n->second.hasServer(server))) - { - nodes.push_back(n->first); - } - } -} - -void ApplicationHelper::print(Output& out, const ApplicationInfo& info) const { assert(!_instance.name.empty()); @@ -3080,17 +2968,6 @@ ApplicationHelper::print(Output& out, const ApplicationInfo& info) const out << eb; } } - if(!_instance.distrib.icepatch.empty()) - { - out << nl << "distribution"; - out << sb; - out << nl << "proxy = `" << _instance.distrib.icepatch << "'"; - if(!_instance.distrib.directories.empty()) - { - out << nl << "directories = `" << toString(_instance.distrib.directories) << "'"; - } - out << eb; - } if(!_instance.replicaGroups.empty()) { out << nl << "replica groups"; @@ -3180,12 +3057,6 @@ ApplicationHelper::printDiff(Output& out, const ApplicationHelper& helper) const } } { - if(_def.distrib != helper._def.distrib) - { - out << nl << "distribution updated"; - } - } - { PropertySetDescriptorDict updt = getDictUpdatedElts(helper._def.propertySets, _def.propertySets); Ice::StringSeq removed = getDictRemovedElts(helper._def.propertySets, _def.propertySets); if(!updt.empty() || !removed.empty()) |