Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE][*DB][CONF][CLUS] Update node config on CC on join ......................................................................
[NO ISSUE][*DB][CONF][CLUS] Update node config on CC on join Change-Id: If8c1471a1c418b435598e47aa6962f038b3d8281 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1927 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> --- M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java 2 files changed, 15 insertions(+), 1 deletion(-) Approvals: Murtadha Hubail: Looks good to me, approved Jenkins: Verified; No violations found; ; Verified diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java index b22a257..cdb3112 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java @@ -43,8 +43,11 @@ import org.apache.asterix.event.schema.cluster.Node; import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; import org.apache.hyracks.api.config.IOption; +import org.apache.hyracks.api.config.Section; import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.exceptions.HyracksException; +import org.apache.hyracks.control.common.application.ConfigManagerApplicationConfig; +import org.apache.hyracks.control.common.config.ConfigManager; import org.apache.hyracks.control.common.controllers.NCConfig; import com.fasterxml.jackson.databind.ObjectMapper; @@ -107,6 +110,7 @@ activeNcConfiguration.put(nodeId, configuration); failedNodes.remove(nodeId); ftStrategy.notifyNodeJoin(nodeId); + updateNodeConfig(nodeId, configuration); } @Override @@ -418,4 +422,14 @@ return new HashSet<>(pendingRemoval); } + private void updateNodeConfig(String nodeId, Map<IOption, Object> configuration) { + ConfigManager configManager = ((ConfigManagerApplicationConfig) appCtx.getServiceContext().getAppConfig()) + .getConfigManager(); + for (Map.Entry<IOption, Object> entry : configuration.entrySet()) { + if (entry.getKey().section() == Section.NC) { + configManager.set(nodeId, entry.getKey(), entry.getValue()); + } + } + } + } diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java index a595301..2e04e13 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java @@ -166,7 +166,7 @@ private Map<IOption, Object> createNodeSpecificMap(String nodeId) { LOGGER.fine("createNodeSpecificMap: " + nodeId); - return new HashMap<>(); + return Collections.synchronizedMap(new HashMap<>()); } @Override -- To view, visit https://asterix-gerrit.ics.uci.edu/1927 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8c1471a1c418b435598e47aa6962f038b3d8281 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org>
