Skip to content

Exempt special satellites from the uname uniqueness check #510

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
mateo-moon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exempt special satellites from the uname uniqueness check #510

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
75 changes: 41 additions & 34 deletions ...inbit/linstor/core/apicallhandler/controller/internal/CtrlAuthResponseApiCallHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,47 +120,54 @@ private void updateUnameMap(Peer peer, String nodeUname)
throws InvalidValueException, DatabaseException
{
Node node = peer.getNode();
Props nodeProps = node.getProps();
@Nullable String oldUname = nodeProps.getProp(InternalApiConsts.NODE_UNAME);
@Nullable NodeName curNodeName = nodeRepo.getUname(nodeUname);
if (!nodeUname.equals(oldUname))
/*
* Special satellites run within the controller's process and therefore all report the
* controller's uname. They also never take part in DRBD, so the uname map (mapping DRBD
* peer unames to node names) does not apply to them.
*/
if (!node.getNodeType().isSpecial())
{
if (oldUname != null)
Props nodeProps = node.getProps();
@Nullable String oldUname = nodeProps.getProp(InternalApiConsts.NODE_UNAME);
@Nullable NodeName curNodeName = nodeRepo.getUname(nodeUname);
if (!nodeUname.equals(oldUname))
{
// uname change, cleanup old uname
nodeRepo.removeUname(oldUname);
}
if (curNodeName != null)
{
peer.setAuthenticated(false);
peer.setConnectionStatus(ApiConsts.ConnectionStatus.DUPLICATE_UNAME);
errorReporter.reportError(
Level.ERROR,
new InvalidNameException(
String.format(
"Satellite has an uname '%s' that is already used by a different satellite '%s'",
nodeUname,
curNodeName),
nodeUname
)
);
if (oldUname != null)
{
// uname change, cleanup old uname
nodeRepo.removeUname(oldUname);
}
if (curNodeName != null)
{
peer.setAuthenticated(false);
peer.setConnectionStatus(ApiConsts.ConnectionStatus.DUPLICATE_UNAME);
errorReporter.reportError(
Level.ERROR,
new InvalidNameException(
String.format(
"Satellite has an uname '%s' that is already used by a different satellite '%s'",
nodeUname,
curNodeName),
nodeUname
)
);
}
else
{
// new node added
nodeProps.setProp(InternalApiConsts.NODE_UNAME, nodeUname);
nodeRepo.putUname(nodeUname, node.getName());
}
}
else
{
// new node added
nodeProps.setProp(InternalApiConsts.NODE_UNAME, nodeUname);
nodeRepo.putUname(nodeUname, node.getName());
}
}
else
{
if (curNodeName == null)
{
// reconnect node
nodeRepo.putUname(nodeUname, node.getName());
if (curNodeName == null)
{
// reconnect node
nodeRepo.putUname(nodeUname, node.getName());
}
}
}

}

private Flux<ApiCallRc> authResponseInTransaction(
Expand Down