Skip to content
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

Support preserving history of HELIX_ENABLED legacy fields when combo of instance operation and old helix version are used #2987

Merged
merged 5 commits into from
Jan 18, 2025
Merged

Support preserving history of HELIX_ENABLED legacy fields when combo of instance operation and old helix version are used #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f83072b
When the new instance operation APIs are used, we need to consider th…
zpinto Jan 16, 2025
32c9ebb
Incorporate feedback.
zpinto Jan 17, 2025
5485375
Remove the commented code.
zpinto Jan 17, 2025
ec96370
Incorporate feedback
zpinto Jan 18, 2025
33b67ca
Cleanup and improve performance of setInstanceOperation.
zpinto Jan 18, 2025
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
2 changes: 2 additions & 0 deletions helix-common/src/main/java/org/apache/helix/constants/InstanceConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ public int getPriority() {
*
* @param disabledType InstanceDisabledType
* @return InstanceOperationTrigger
* @deprecated The concept of InstanceDisabledType mapping directly to an InstanceOperationSource is no longer used.
*/
@Deprecated
public static InstanceOperationSource instanceDisabledTypeToInstanceOperationSource(
InstanceDisabledType disabledType) {
switch (disabledType) {
Expand Down
22 changes: 7 additions & 15 deletions ...-core/src/main/java/org/apache/helix/cloud/event/helix/DefaultCloudEventCallbackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,9 @@ public void disableInstance(HelixManager manager, Object eventInfo) {
LOG.info("DefaultCloudEventCallbackImpl disable Instance {}", manager.getInstanceName());
if (InstanceValidationUtil
.isEnabled(manager.getHelixDataAccessor(), manager.getInstanceName())) {
InstanceUtil.setInstanceOperation(manager.getConfigAccessor(),
manager.getHelixDataAccessor().getBaseDataAccessor(), manager.getClusterName(),
manager.getInstanceName(),
new InstanceConfig.InstanceOperation.Builder().setOperation(
InstanceConstants.InstanceOperation.DISABLE)
.setSource(InstanceConstants.InstanceOperationSource.AUTOMATION)
.setReason(message)
.build());
manager.getClusterManagmentTool()
.enableInstance(manager.getClusterName(), manager.getInstanceName(), false,
InstanceConstants.InstanceDisabledType.CLOUD_EVENT, message);
}
HelixEventHandlingUtil.updateCloudEventOperationInClusterConfig(manager.getClusterName(),
manager.getInstanceName(), manager.getHelixDataAccessor().getBaseDataAccessor(), false,
Expand All @@ -79,13 +74,10 @@ public void enableInstance(HelixManager manager, Object eventInfo) {
HelixEventHandlingUtil
.updateCloudEventOperationInClusterConfig(manager.getClusterName(), instanceName,
manager.getHelixDataAccessor().getBaseDataAccessor(), true, message);
InstanceUtil.setInstanceOperation(manager.getConfigAccessor(),
manager.getHelixDataAccessor().getBaseDataAccessor(), manager.getClusterName(),
manager.getInstanceName(),
new InstanceConfig.InstanceOperation.Builder().setOperation(
InstanceConstants.InstanceOperation.ENABLE)
.setSource(InstanceConstants.InstanceOperationSource.AUTOMATION).setReason(message)
.build());
if (HelixEventHandlingUtil.isInstanceDisabledForCloudEvent(instanceName, accessor)) {
manager.getClusterManagmentTool().enableInstance(manager.getClusterName(), instanceName, true,
InstanceConstants.InstanceDisabledType.CLOUD_EVENT, message);
}
}

/**
Expand Down
19 changes: 12 additions & 7 deletions helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ public boolean forceKillInstance(String clusterName, String instanceName, String

InstanceConfig.InstanceOperation instanceOperationObj = new InstanceConfig.InstanceOperation.Builder()
.setOperation(InstanceConstants.InstanceOperation.UNKNOWN).setReason(reason)
.setSource(operationSource != null ? operationSource : InstanceConstants.InstanceOperationSource.USER).build();
.setSource(operationSource).build();
InstanceConfig instanceConfig = getInstanceConfig(clusterName, instanceName);
instanceConfig.setInstanceOperation(instanceOperationObj);

Expand Down Expand Up @@ -2363,12 +2363,17 @@ public ZNRecord update(ZNRecord currentData) {
}

InstanceConfig config = new InstanceConfig(currentData);
config.setInstanceOperation(new InstanceConfig.InstanceOperation.Builder().setOperation(
enabled ? InstanceConstants.InstanceOperation.ENABLE
: InstanceConstants.InstanceOperation.DISABLE).setReason(reason).setSource(
disabledType != null
? InstanceConstants.InstanceOperationSource.instanceDisabledTypeToInstanceOperationSource(
disabledType) : null).build());
config.setInstanceEnabled(enabled);
if (!enabled) {
// new disabled type and reason will overwrite existing ones.
config.resetInstanceDisabledTypeAndReason();
if (reason != null) {
config.setInstanceDisabledReason(reason);
}
if (disabledType != null) {
config.setInstanceDisabledType(disabledType);
}
}
return config.getRecord();
}
}, AccessOption.PERSISTENT);
Expand Down
Loading
Loading