hani-fouladgar commented on code in PR #11218:
URL: https://github.com/apache/ozone/pull/11218#discussion_r4039729577
##########
hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/proxy/SCMFailoverProxyProviderBase.java:
##########
@@ -188,16 +188,82 @@ protected synchronized void loadConfigs() {
String scmServiceId = scmNodeInfo.getServiceId();
String scmNodeId = scmNodeInfo.getNodeId();
- scmNodeIds.add(scmNodeId);
+ newScmNodeIds.add(scmNodeId);
// Preserve the original config string so DNS can be re-resolved
// on connection failure when the SCM peer is rescheduled to a
// new IP (Kubernetes pod-IP-change recovery). See
// refreshProxyAddressIfChanged(String).
SCMProxyInfo scmProxyInfo = new SCMProxyInfo(scmServiceId, scmNodeId,
protocolAddr, protocolAddress);
- scmProxyInfoMap.put(scmNodeId, scmProxyInfo);
+ newScmProxyInfoMap.put(scmNodeId, scmProxyInfo);
+ }
+ }
+
+ // Commit only after the whole configuration parsed successfully. A dynamic
+ // reconfiguration that adds an SCM needs two properties updated (the node
+ // list and the new node's address) and they can be applied in either
order;
+ // if the node list is updated first, buildNodeInfo above throws and the
+ // previous state is left intact so the operator can retry.
+ scmNodeIds = newScmNodeIds;
+ scmProxyInfoMap.clear();
+ scmProxyInfoMap.putAll(newScmProxyInfoMap);
+ }
+
+ /**
+ * Reload the SCM node list and their addresses from the (already updated)
Review Comment:
Done. Removed the duplicated "applied in either order" reasoning here; it
now lives in one place — the reconfScmNodes javadoc in OzoneManager.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
