You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@helix.apache.org by GitBox <gi...@apache.org> on 2022/05/16 06:03:17 UTC
[GitHub] [helix] xyuanlu opened a new pull request, #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
xyuanlu opened a new pull request, #2100:
URL: https://github.com/apache/helix/pull/2100
### Issues
- [X] My PR addresses the following Helix issues and references them in the PR description:
#2000
### Description
- [X] Here are some details about my PR, including screenshots of any UI changes:
Batch enable/disable instance now will update 2 map fields, DISABLED_INSTANCES, and DISABLED_INSTANCES_W_INFO.
Keep the format for DISABLED_INSTANCES the same as before.
### Tests
- [X] The following tests are written for this issue:
Updated TestBatchEnableInstances and TestInstancesAccessor
- The following is the result of the "mvn test" command on the appropriate module:
(If CI test fails due to known issue, please specify the issue and test PR locally. Then copy & paste the result of "mvn test" to here.)
### Changes that Break Backward Compatibility (Optional)
- My PR contains changes that break backward compatibility or previous assumptions for certain methods or API. They include:
(Consider including all behavior changes for public methods or API. Also include these changes in merge description so that other developers are aware of these changes. This allows them to make relevant code changes in feature branches accounting for the new method/API behavior.)
### Documentation (Optional)
- In case of new functionality, my PR adds documentation in the following wiki page:
(Link the GitHub wiki you added)
### Commits
- My commits all reference appropriate Apache Helix GitHub issues in their subject lines. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)":
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
### Code Quality
- My diff has been formatted using helix-style.xml
(helix-style-intellij.xml if IntelliJ IDE is used)
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on PR #2100:
URL: https://github.com/apache/helix/pull/2100#issuecomment-1130308768
This change is ready to be merged. Approved by @junkaixue
Commit message - Fix incompatible issue for clusterConfig mapfields
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] qqu0127 commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
qqu0127 commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r875346506
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -77,18 +76,22 @@ public enum ClusterConfigProperty {
TARGET_EXTERNALVIEW_ENABLED,
@Deprecated // ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE will take
- // precedence if it is set
- ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
+ // precedence if it is set
+ ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
// transition if the number of partitons that need
// recovery exceeds this limitation
ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance
// state transition if the number of
// partitons that need recovery or in
// error exceeds this limitation
DISABLED_INSTANCES,
+ DISABLED_INSTANCES_WITH_INFO,
+ // disabled instances and disabled instances with info are for storing batch disabled instances.
+ // disabled instances will write into both 2 fields for backward compatibility.
VIEW_CLUSTER, // Set to "true" to indicate this is a view cluster
- VIEW_CLUSTER_SOURCES, // Map field, key is the name of source cluster, value is
+ VIEW_CLUSTER_SOURCES, // Map field, key is the name of source clust:1175
+ // er, value is
Review Comment:
Is this intentional?
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -77,18 +76,22 @@ public enum ClusterConfigProperty {
TARGET_EXTERNALVIEW_ENABLED,
@Deprecated // ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE will take
- // precedence if it is set
- ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
+ // precedence if it is set
+ ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
Review Comment:
Indentation? Please ignore if this is just a UI display issue.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] junkaixue commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
junkaixue commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r875143696
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -86,6 +85,9 @@ public enum ClusterConfigProperty {
// partitons that need recovery or in
// error exceeds this limitation
DISABLED_INSTANCES,
+ DISABLED_INSTANCES_W_INFO,
Review Comment:
NIT: Let's have a full name of it DISABLED_INSTANCES_WITH_INFO.
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -1118,26 +1138,41 @@ public String getClusterName() {
}
public String getPlainInstanceHelixDisabledType(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.get(ClusterConfigProperty.HELIX_DISABLED_TYPE.toString());
}
public String getInstanceHelixDisabledType(String instanceName) {
- if (!getDisabledInstances().containsKey(instanceName)) {
+ if (!getDisabledInstancesWithInfo().containsKey(instanceName) &&
+ !getDisabledInstances().containsKey(instanceName)) {
return InstanceConstants.INSTANCE_NOT_DISABLED;
}
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.getOrDefault(ClusterConfigProperty.HELIX_DISABLED_TYPE.toString(),
InstanceConstants.InstanceDisabledType.DEFAULT_INSTANCE_DISABLE_TYPE.toString());
}
+ /**
+ * @return a String representing reason.
+ * null if instance is not disabled in batch mode or do not have disabled reason
+ */
public String getInstanceHelixDisabledReason(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.get(ClusterConfigProperty.HELIX_DISABLED_REASON.toString());
}
+ /**
+ * @param instanceName
+ * @return a String representation of unix time
+ * null if the instance is not disabled in batch mode.
+ */
public String getInstanceHelixDisabledTimeStamp(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
- .get(ClusterConfigProperty.HELIX_ENABLED_DISABLE_TIMESTAMP.toString());
+ if (getDisabledInstancesWithInfo().containsKey(instanceName)) {
+ return ConfigStringUtil.parseConcatenatedConfig(
+ getDisabledInstancesWithInfo().get(instanceName))
+ .get(ClusterConfigProperty.HELIX_ENABLED_DISABLE_TIMESTAMP.toString());
+ } else {
+ return getDisabledInstances().get(instanceName);
+ }
Review Comment:
NIT: you dont need the else clause.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r874149798
##########
helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java:
##########
@@ -1933,28 +1933,35 @@ public ZNRecord update(ZNRecord currentData) {
ClusterConfig clusterConfig = new ClusterConfig(currentData);
Map<String, String> disabledInstances = new TreeMap<>(clusterConfig.getDisabledInstances());
+ Map<String, String> disabledInstancesWithInfo = new TreeMap<>(clusterConfig.getDisabledInstancesWithInfo());
if (enabled) {
disabledInstances.keySet().removeAll(instances);
+ disabledInstancesWithInfo.keySet().removeAll(instances);
} else {
for (String disabledInstance : instances) {
// We allow user to override disabledType and reason for an already disabled instance.
+ // TODO: we are updating both DISABLED_INSTANCES and DISABLED_INSTANCES_W_INFO for
+ // backward compatible. Deprecate DISABLED_INSTANCES in the future.
// TODO: update the history ZNode
- disabledInstances
- .put(disabledInstance, assembleInstanceBatchedDisabledInfo(disabledType, reason));
+ String timeStamp = String.valueOf(System.currentTimeMillis());
+ disabledInstances.put(disabledInstance, timeStamp);
+ disabledInstancesWithInfo
+ .put(disabledInstance, assembleInstanceBatchedDisabledInfo(disabledType, reason, timeStamp));
}
}
clusterConfig.setDisabledInstances(disabledInstances);
+ clusterConfig.setDisabledInstancesWithInfo(disabledInstancesWithInfo);
Review Comment:
As we discussed offline, will add a PR for format rewrite to ZNode.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r876175068
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -77,18 +76,22 @@ public enum ClusterConfigProperty {
TARGET_EXTERNALVIEW_ENABLED,
@Deprecated // ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE will take
- // precedence if it is set
- ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
+ // precedence if it is set
+ ERROR_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance state
// transition if the number of partitons that need
// recovery exceeds this limitation
ERROR_OR_RECOVERY_PARTITION_THRESHOLD_FOR_LOAD_BALANCE, // Controller won't execute load balance
// state transition if the number of
// partitons that need recovery or in
// error exceeds this limitation
DISABLED_INSTANCES,
+ DISABLED_INSTANCES_WITH_INFO,
+ // disabled instances and disabled instances with info are for storing batch disabled instances.
+ // disabled instances will write into both 2 fields for backward compatibility.
VIEW_CLUSTER, // Set to "true" to indicate this is a view cluster
- VIEW_CLUSTER_SOURCES, // Map field, key is the name of source cluster, value is
+ VIEW_CLUSTER_SOURCES, // Map field, key is the name of source clust:1175
+ // er, value is
Review Comment:
TFTR. Updated. It was an accidental change.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r875327028
##########
helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/DelayedRebalanceUtil.java:
##########
@@ -139,10 +139,10 @@ private static long getInactiveTime(String instance, Set<String> liveInstances,
// check the time instance got disabled.
if (!InstanceValidationUtil.isInstanceEnabled(instanceConfig, clusterConfig)) {
long disabledTime = instanceConfig.getInstanceEnabledTime();
- Map<String, String> disabledInstances = clusterConfig.getDisabledInstances();
- if (disabledInstances.containsKey(instance)) {
+ String batchedDisabledTime = clusterConfig.getInstanceHelixDisabledTimeStamp(instance);
+ if (batchedDisabledTime != null && !batchedDisabledTime.isEmpty()) {
// Update batch disable time
- long batchDisableTime = Long.parseLong(clusterConfig.getInstanceHelixDisabledTimeStamp(instance));
+ long batchDisableTime = Long.parseLong(batchedDisabledTime);
if (disabledTime == -1 || disabledTime > batchDisableTime) {
Review Comment:
The disabled time is read using system time. The format should not have issue if user do not direct write to ZNode.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] qqu0127 commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
qqu0127 commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r874002827
##########
helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java:
##########
@@ -171,6 +173,11 @@ public void testUpdateInstances() throws IOException {
clusterConfig = _configAccessor.getClusterConfig(CLUSTER_NAME);
Assert.assertEquals(clusterConfig.getDisabledInstances().keySet(),
new HashSet<>(Arrays.asList(CLUSTER_NAME + "localhost_12919")));
+ Assert.assertEquals(clusterConfig.getDisabledInstancesWithInfo().keySet(),
+ new HashSet<>(Arrays.asList(CLUSTER_NAME + "localhost_12919")));
+ Assert.assertEquals(Long.parseLong(
+ clusterConfig.getInstanceHelixDisabledTimeStamp(CLUSTER_NAME + "localhost_12919")),
+ Long.parseLong(clusterConfig.getDisabledInstances().get(CLUSTER_NAME + "localhost_12919")));
Review Comment:
Let's add a test case to cover new controller code parsing the old data format.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] desaikomal commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
desaikomal commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r875202985
##########
helix-core/src/main/java/org/apache/helix/controller/rebalancer/util/DelayedRebalanceUtil.java:
##########
@@ -139,10 +139,10 @@ private static long getInactiveTime(String instance, Set<String> liveInstances,
// check the time instance got disabled.
if (!InstanceValidationUtil.isInstanceEnabled(instanceConfig, clusterConfig)) {
long disabledTime = instanceConfig.getInstanceEnabledTime();
- Map<String, String> disabledInstances = clusterConfig.getDisabledInstances();
- if (disabledInstances.containsKey(instance)) {
+ String batchedDisabledTime = clusterConfig.getInstanceHelixDisabledTimeStamp(instance);
+ if (batchedDisabledTime != null && !batchedDisabledTime.isEmpty()) {
// Update batch disable time
- long batchDisableTime = Long.parseLong(clusterConfig.getInstanceHelixDisabledTimeStamp(instance));
+ long batchDisableTime = Long.parseLong(batchedDisabledTime);
if (disabledTime == -1 || disabledTime > batchDisableTime) {
Review Comment:
can batchDisableTime result in NumberFormatException?? (ie. if user specifies wrong value in znode)
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r874148705
##########
helix-rest/src/test/java/org/apache/helix/rest/server/TestInstancesAccessor.java:
##########
@@ -171,6 +173,11 @@ public void testUpdateInstances() throws IOException {
clusterConfig = _configAccessor.getClusterConfig(CLUSTER_NAME);
Assert.assertEquals(clusterConfig.getDisabledInstances().keySet(),
new HashSet<>(Arrays.asList(CLUSTER_NAME + "localhost_12919")));
+ Assert.assertEquals(clusterConfig.getDisabledInstancesWithInfo().keySet(),
+ new HashSet<>(Arrays.asList(CLUSTER_NAME + "localhost_12919")));
+ Assert.assertEquals(Long.parseLong(
+ clusterConfig.getInstanceHelixDisabledTimeStamp(CLUSTER_NAME + "localhost_12919")),
+ Long.parseLong(clusterConfig.getDisabledInstances().get(CLUSTER_NAME + "localhost_12919")));
Review Comment:
This test will add oldKey:oldFormat in cluster config znode and controller will read it using getDisabledInstance.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] desaikomal commented on pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
desaikomal commented on PR #2100:
URL: https://github.com/apache/helix/pull/2100#issuecomment-1127817068
Can you please correct the bug number which this PR fixes?
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] xyuanlu commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
xyuanlu commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r875200001
##########
helix-core/src/main/java/org/apache/helix/model/ClusterConfig.java:
##########
@@ -1118,26 +1138,41 @@ public String getClusterName() {
}
public String getPlainInstanceHelixDisabledType(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.get(ClusterConfigProperty.HELIX_DISABLED_TYPE.toString());
}
public String getInstanceHelixDisabledType(String instanceName) {
- if (!getDisabledInstances().containsKey(instanceName)) {
+ if (!getDisabledInstancesWithInfo().containsKey(instanceName) &&
+ !getDisabledInstances().containsKey(instanceName)) {
return InstanceConstants.INSTANCE_NOT_DISABLED;
}
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.getOrDefault(ClusterConfigProperty.HELIX_DISABLED_TYPE.toString(),
InstanceConstants.InstanceDisabledType.DEFAULT_INSTANCE_DISABLE_TYPE.toString());
}
+ /**
+ * @return a String representing reason.
+ * null if instance is not disabled in batch mode or do not have disabled reason
+ */
public String getInstanceHelixDisabledReason(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
+ return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstancesWithInfo().get(instanceName))
.get(ClusterConfigProperty.HELIX_DISABLED_REASON.toString());
}
+ /**
+ * @param instanceName
+ * @return a String representation of unix time
+ * null if the instance is not disabled in batch mode.
+ */
public String getInstanceHelixDisabledTimeStamp(String instanceName) {
- return ConfigStringUtil.parseConcatenatedConfig(getDisabledInstances().get(instanceName))
- .get(ClusterConfigProperty.HELIX_ENABLED_DISABLE_TIMESTAMP.toString());
+ if (getDisabledInstancesWithInfo().containsKey(instanceName)) {
+ return ConfigStringUtil.parseConcatenatedConfig(
+ getDisabledInstancesWithInfo().get(instanceName))
+ .get(ClusterConfigProperty.HELIX_ENABLED_DISABLE_TIMESTAMP.toString());
+ } else {
+ return getDisabledInstances().get(instanceName);
+ }
Review Comment:
TFTR. Updated.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] junkaixue merged pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
junkaixue merged PR #2100:
URL: https://github.com/apache/helix/pull/2100
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org
[GitHub] [helix] qqu0127 commented on a diff in pull request #2100: Fix incompatible issue for clusterConfig mapfields disabledInstances
Posted by GitBox <gi...@apache.org>.
qqu0127 commented on code in PR #2100:
URL: https://github.com/apache/helix/pull/2100#discussion_r874005767
##########
helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java:
##########
@@ -1933,28 +1933,35 @@ public ZNRecord update(ZNRecord currentData) {
ClusterConfig clusterConfig = new ClusterConfig(currentData);
Map<String, String> disabledInstances = new TreeMap<>(clusterConfig.getDisabledInstances());
+ Map<String, String> disabledInstancesWithInfo = new TreeMap<>(clusterConfig.getDisabledInstancesWithInfo());
if (enabled) {
disabledInstances.keySet().removeAll(instances);
+ disabledInstancesWithInfo.keySet().removeAll(instances);
} else {
for (String disabledInstance : instances) {
// We allow user to override disabledType and reason for an already disabled instance.
+ // TODO: we are updating both DISABLED_INSTANCES and DISABLED_INSTANCES_W_INFO for
+ // backward compatible. Deprecate DISABLED_INSTANCES in the future.
// TODO: update the history ZNode
- disabledInstances
- .put(disabledInstance, assembleInstanceBatchedDisabledInfo(disabledType, reason));
+ String timeStamp = String.valueOf(System.currentTimeMillis());
+ disabledInstances.put(disabledInstance, timeStamp);
+ disabledInstancesWithInfo
+ .put(disabledInstance, assembleInstanceBatchedDisabledInfo(disabledType, reason, timeStamp));
}
}
clusterConfig.setDisabledInstances(disabledInstances);
+ clusterConfig.setDisabledInstancesWithInfo(disabledInstancesWithInfo);
Review Comment:
A general question.
I see the new controller now writes to two fields together. What happens if the two fields are inconsistent? This will likely be the case when we upgrade controller again with existing disabled instance data in the old field.
--
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: reviews-unsubscribe@helix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@helix.apache.org
For additional commands, e-mail: reviews-help@helix.apache.org