This is an automated email from the ASF dual-hosted git repository.
yashmayya pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 487daf07a9 Fix PinotZKChanger HelixManager instance names (#15961)
487daf07a9 is described below
commit 487daf07a98c67f0d168240a78bbd614c4f86bcc
Author: Yash Mayya <[email protected]>
AuthorDate: Tue Jun 3 03:40:47 2025 +0100
Fix PinotZKChanger HelixManager instance names (#15961)
---
.../main/java/org/apache/pinot/tools/ClusterStateVerifier.java | 2 +-
.../{PinotIdealstateChanger.java => PinotIdealStateChanger.java} | 8 ++++----
.../main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java | 2 +-
.../main/java/org/apache/pinot/tools/PinotTableRebalancer.java | 2 +-
.../src/main/java/org/apache/pinot/tools/PinotZKChanger.java | 4 ++--
.../org/apache/pinot/tools/admin/command/MoveReplicaGroup.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/ClusterStateVerifier.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/ClusterStateVerifier.java
index 1764e17d76..b73048d788 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/ClusterStateVerifier.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/ClusterStateVerifier.java
@@ -39,7 +39,7 @@ public class ClusterStateVerifier extends PinotZKChanger {
private static final int MAX_SLEEP_BETWEEN_CHECKS_MILLIS = 30_000;
public ClusterStateVerifier(String zkAddress, String clusterName) {
- super(zkAddress, clusterName);
+ super("ClusterStateVerifier", zkAddress, clusterName);
}
/**
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealstateChanger.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealStateChanger.java
similarity index 89%
rename from
pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealstateChanger.java
rename to
pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealStateChanger.java
index 0f4243be33..b6dd84c547 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealstateChanger.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotIdealStateChanger.java
@@ -26,13 +26,13 @@ import org.apache.pinot.common.utils.helix.HelixHelper;
import org.apache.pinot.spi.utils.retry.RetryPolicies;
-public class PinotIdealstateChanger extends PinotZKChanger {
+public class PinotIdealStateChanger extends PinotZKChanger {
private final String _tableNameWithType;
private final boolean _dryRun;
- public PinotIdealstateChanger(String zkAddress, String clusterName, String
tableNameWithType, boolean dryRun) {
- super(zkAddress, clusterName);
+ public PinotIdealStateChanger(String zkAddress, String clusterName, String
tableNameWithType, boolean dryRun) {
+ super("PinotIdealStateChanger", zkAddress, clusterName);
_tableNameWithType = tableNameWithType;
_dryRun = dryRun;
}
@@ -60,7 +60,7 @@ public class PinotIdealstateChanger extends PinotZKChanger {
final String clusterName = "LLCRealtimeClusterIntegrationTest";
final String tableName = "mytable_REALTIME";
- PinotIdealstateChanger changer = new PinotIdealstateChanger(zkAddress,
clusterName, tableName, dryRun);
+ PinotIdealStateChanger changer = new PinotIdealStateChanger(zkAddress,
clusterName, tableName, dryRun);
changer.updateIdealState();
}
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java
index 528453115e..1c7eb8a4af 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotNumReplicaChanger.java
@@ -38,7 +38,7 @@ public class PinotNumReplicaChanger extends PinotZKChanger {
private boolean _dryRun;
public PinotNumReplicaChanger(String zkAddress, String clusterName, boolean
dryRun) {
- super(zkAddress, clusterName);
+ super("PinotNumReplicaChanger", zkAddress, clusterName);
_dryRun = dryRun;
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
index 75d58f7cfd..39ccd02602 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotTableRebalancer.java
@@ -37,7 +37,7 @@ public class PinotTableRebalancer extends PinotZKChanger {
boolean includeConsuming, Enablement minimizeDataMovement, boolean
bootstrap, boolean downtime,
int minReplicasToKeepUpForNoDowntime, int batchSizePerServer, boolean
lowDiskMode, boolean bestEffort,
long externalViewCheckIntervalInMs, long
externalViewStabilizationTimeoutInMs) {
- super(zkAddress, clusterName);
+ super("PinotTableRebalancer", zkAddress, clusterName);
_rebalanceConfig.setDryRun(dryRun);
_rebalanceConfig.setReassignInstances(reassignInstances);
_rebalanceConfig.setIncludeConsuming(includeConsuming);
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java
index fd8c2a0cb7..3d5b1adc9b 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/PinotZKChanger.java
@@ -49,11 +49,11 @@ public class PinotZKChanger {
protected String _clusterName;
protected ZkHelixPropertyStore<ZNRecord> _propertyStore;
- public PinotZKChanger(String zkAddress, String clusterName) {
+ public PinotZKChanger(String name, String zkAddress, String clusterName) {
_clusterName = clusterName;
_helixAdmin = new ZKHelixAdmin(zkAddress);
_helixManager = HelixManagerFactory
- .getZKHelixManager(clusterName, "PinotNumReplicaChanger",
InstanceType.ADMINISTRATOR, zkAddress);
+ .getZKHelixManager(clusterName, name, InstanceType.ADMINISTRATOR,
zkAddress);
try {
_helixManager.connect();
} catch (Exception e) {
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java
index b7d1754b9b..8be0dcafd9 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/MoveReplicaGroup.java
@@ -119,7 +119,7 @@ public class MoveReplicaGroup extends
AbstractBaseAdminCommand implements Comman
throws IOException, InterruptedException {
validateParams();
- _zkChanger = new PinotZKChanger(_zkHost, _zkPath);
+ _zkChanger = new PinotZKChanger("MoveReplicaGroup", _zkHost, _zkPath);
_helix = _zkChanger.getHelixAdmin();
if (!isExistingTable(_tableName)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
