Skip to content

Fix bogus server session released check in IceGrid node. #4625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix bogus server session released check in IceGrid node. #4625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpp/src/IceGrid/ServerI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,15 +1952,15 @@ ServerI::updateImpl(const shared_ptr<InternalServerDescriptor>& descriptor)
{
assert(_load && descriptor);

_desc = descriptor;
_waitForReplication = true;

// Remember if the server was just released by a session, this will be used later to not update the configuration
// on the disk (as an optimization and to allow users to review the configuration file after allocating a server --
// that's useful if the server configuration is bogus and the session server can't start).
bool serverSessionReleased = _desc && _desc->activation == "session" && _desc->revision == descriptor->revision &&
Copy link
Member Author

@pepone pepone Nov 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check only makes sense if we do it before updating _desc.

!_desc->sessionId.empty() && descriptor->sessionId.empty();

_desc = descriptor;
_waitForReplication = true;

// Go through the adapters and create the object adapter Ice objects if necessary, also remove the old ones.
{
ServerAdapterDict oldAdapters;
Expand Down