summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp17
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp5
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp9
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp5
4 files changed, 10 insertions, 26 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 66cc757afc1..63e23ea919c 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -149,7 +149,7 @@ public:
}
void
- ice_response(const ServerPrx& proxy, const AdapterPrxDict& adpts, int at, int dt)
+ ice_response(const ServerPrx& server, const AdapterPrxDict& adapters, int at, int dt)
{
if(_traceLevels && _traceLevels->server > 1)
{
@@ -158,15 +158,9 @@ public:
}
//
- // Add the node session timeout on the proxies.
+ // Add the node session timeout on the proxies to ensure the
+ // timeout is large enough.
//
- ServerPrx server = ServerPrx::uncheckedCast(proxy->ice_timeout(_timeout * 1000));
- AdapterPrxDict adapters;
- for(AdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p)
- {
- adapters.insert(make_pair(p->first, AdapterPrx::uncheckedCast(p->second->ice_timeout(_timeout * 1000))));
- }
-
_server->loadCallback(server, adapters, at + _timeout, dt + _timeout);
}
@@ -556,7 +550,7 @@ NodeEntry::loadServer(const ServerEntryPtr& entry, const ServerInfo& server, con
// time to deactivate, up to "deactivation-timeout"
// seconds).
//
- if(timeout > 0 && timeout != sessionTimeout)
+ if(timeout > 0)
{
node = NodePrx::uncheckedCast(node->ice_timeout(timeout * 1000));
}
@@ -608,7 +602,6 @@ NodeEntry::destroyServer(const ServerEntryPtr& entry, const ServerInfo& info, in
Lock sync(*this);
checkSession();
node = _session->getNode();
- int sessionTimeout = _session->getTimeout();
//
// Check if we should use a specific timeout (the load
@@ -616,7 +609,7 @@ NodeEntry::destroyServer(const ServerEntryPtr& entry, const ServerInfo& info, in
// time to deactivate, up to "deactivation-timeout"
// seconds).
//
- if(timeout > 0 && timeout != sessionTimeout)
+ if(timeout > 0)
{
node = NodePrx::uncheckedCast(node->ice_timeout(timeout * 1000));
}
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index e35dd5f0c6e..afc5619c2d5 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -138,7 +138,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
const LoadInfo& load) :
_database(database),
_traceLevels(database->getTraceLevels()),
- _node(NodePrx::uncheckedCast(node->ice_timeout(timeout * 1000))),
+ _node(node),
_info(info),
_timeout(timeout),
_timestamp(IceUtil::Time::now()),
@@ -155,8 +155,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
objInfo.proxy = _node;
_database->addInternalObject(objInfo, true); // Add or update previous node proxy.
- Ice::ObjectPrx prx = _database->getInternalAdapter()->addWithUUID(this)->ice_timeout(timeout * 1000);
- _proxy = NodeSessionPrx::uncheckedCast(prx);
+ _proxy = NodeSessionPrx::uncheckedCast(_database->getInternalAdapter()->addWithUUID(this));
}
catch(const NodeActiveException&)
{
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index ff0886ba67e..e059519cbc0 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -1177,9 +1177,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry,
set<NodePrx> nodes;
nodes.insert(dbNodes.begin(), dbNodes.end());
- int timeout =
- _communicator->getProperties()->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
-
for(InternalRegistryPrxSeq::const_iterator r = replicas.begin(); r != replicas.end(); ++r)
{
if((*r)->ice_getIdentity() != internalRegistry->ice_getIdentity())
@@ -1201,7 +1198,6 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry,
try
{
- InternalRegistryPrx replica = InternalRegistryPrx::uncheckedCast((*r)->ice_timeout(timeout * 1000));
(*r)->registerWithReplica(internalRegistry);
NodePrxSeq nds = (*r)->getNodes();
nodes.insert(nds.begin(), nds.end());
@@ -1252,15 +1248,12 @@ RegistryI::registerNodes(const InternalRegistryPrx& internalRegistry, const Node
{
const string prefix("Node-");
- int timeout =
- _communicator->getProperties()->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
for(NodePrxSeq::const_iterator p = nodes.begin(); p != nodes.end(); ++p)
{
assert((*p)->ice_getIdentity().name.find(prefix) != string::npos);
try
{
- NodePrx node = NodePrx::uncheckedCast((*p)->ice_timeout(timeout * 1000));
- _database->getNode((*p)->ice_getIdentity().name.substr(prefix.size()))->setProxy(node);
+ _database->getNode((*p)->ice_getIdentity().name.substr(prefix.size()))->setProxy(*p);
}
catch(const NodeNotExistException&)
{
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 389230ebe97..67c633308ff 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -36,7 +36,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
_database(database),
_wellKnownObjects(wellKnownObjects),
_traceLevels(database->getTraceLevels()),
- _internalRegistry(InternalRegistryPrx::uncheckedCast(proxy->ice_timeout(timeout * 1000))),
+ _internalRegistry(proxy),
_info(info),
_timeout(timeout),
_timestamp(IceUtil::Time::now()),
@@ -50,8 +50,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
ObserverTopicPtr obsv = _database->getObserverTopic(RegistryObserverTopicName);
RegistryObserverTopicPtr::dynamicCast(obsv)->registryUp(toRegistryInfo(_info));
- Ice::ObjectPrx prx = _database->getInternalAdapter()->addWithUUID(this)->ice_timeout(timeout * 1000);
- _proxy = ReplicaSessionPrx::uncheckedCast(prx);
+ _proxy = ReplicaSessionPrx::uncheckedCast(_database->getInternalAdapter()->addWithUUID(this));
}
catch(const ReplicaActiveException&)
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 10:48:22 +0000