qqu0127 commented on code in PR #2106:
URL: https://github.com/apache/helix/pull/2106#discussion_r877549748
##########
helix-core/src/main/java/org/apache/helix/controller/dataproviders/BaseControllerDataProvider.java:
##########
@@ -241,13 +244,87 @@ private void refreshClusterConfig(final HelixDataAccessor
accessor,
if
(_propertyDataChangedMap.get(HelixConstants.ChangeType.CLUSTER_CONFIG).getAndSet(false))
{
_clusterConfig =
accessor.getProperty(accessor.keyBuilder().clusterConfig());
refreshedType.add(HelixConstants.ChangeType.CLUSTER_CONFIG);
+ // TODO: This is a temp function to clean up incompatible batched
disabled instances format.
+ // Remove in later version.
+ if (checkBatchedDisabledInstanceFormat(_clusterConfig) &&
updateBatchDisableFormat(
+ accessor)) {
+ // read from zkz one more time
+ LogUtil.logInfo(logger, getClusterEventId(), String
+ .format("Clean ClusterConfig change for cluster %s, pipeline %s",
_clusterName,
+ getPipelineName()));
+ _clusterConfig =
accessor.getProperty(accessor.keyBuilder().clusterConfig());
+ }
refreshAbnormalStateResolverMap(_clusterConfig);
} else {
- LogUtil.logInfo(logger, getClusterEventId(), String.format(
- "No ClusterConfig change for cluster %s, pipeline %s", _clusterName,
getPipelineName()));
+ LogUtil.logInfo(logger, getClusterEventId(), String
+ .format("No ClusterConfig change for cluster %s, pipeline %s",
_clusterName,
+ getPipelineName()));
}
}
+ // TODO: This function is used to clean up incompatible batched disabled
instances format for
+ // "DISABLED_INSTANCES" introduced in 1.0.3.0. This temp change shoul dbe
reverted after 1.0.5.0 \
+ // or later version.
+ private boolean updateBatchDisableFormat(final HelixDataAccessor accessor) {
+ return accessor
+ .updateProperty(accessor.keyBuilder().clusterConfig(), new
DataUpdater<ZNRecord>() {
+ @Override
+ public ZNRecord update(ZNRecord currentData) {
+ if (currentData == null) {
+ throw new HelixException(
+ "Cluster: " + _clusterConfig.getClusterName() + ": cluster
config is null");
+ }
Review Comment:
Similar to Junkai's comment above, let's try to combine the read-and-write
pattern into one. If the currentData is null OR the format is good, we can just
keep it. In such way we can combine the two methods into one updater.
--
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]
