You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ji...@apache.org on 2020/05/23 00:12:27 UTC
[helix] branch master updated: Fix conflicting MonitorDomainNames
in metrics-common and helix-core (#1023)
This is an automated email from the ASF dual-hosted git repository.
jiajunwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new 9a1fbb8 Fix conflicting MonitorDomainNames in metrics-common and helix-core (#1023)
9a1fbb8 is described below
commit 9a1fbb831a62313a2290d066b809b58d8861165b
Author: Huizhi Lu <ih...@gmail.com>
AuthorDate: Fri May 22 17:12:18 2020 -0700
Fix conflicting MonitorDomainNames in metrics-common and helix-core (#1023)
There are two MonitorDomainNames classes in modules: helix-core and metrics-common. The one in metrics-common misses a field Rebalancer and would cause RuntimeException error and failure for customers' running if the old class is being used in runtime: java.lang.NoSuchFieldError: Rebalancer.
This commit fixes this issue by updating the class MonitorDomainNames in metrics-common and removing the duplicate one in helix-core
---
.../monitoring/mbeans/MonitorDomainNames.java | 33 ----------------------
.../monitoring/mbeans/MonitorDomainNames.java | 3 +-
2 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java
deleted file mode 100644
index fee9099..0000000
--- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.helix.monitoring.mbeans;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * This enum defines all of domain names used with various Helix monitor mbeans.
- */
-public enum MonitorDomainNames {
- ClusterStatus,
- HelixZkClient,
- HelixThreadPoolExecutor,
- HelixCallback,
- RoutingTableProvider,
- CLMParticipantReport,
- Rebalancer
-}
diff --git a/metrics-common/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java b/metrics-common/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java
index 73bf057..fee9099 100644
--- a/metrics-common/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java
+++ b/metrics-common/src/main/java/org/apache/helix/monitoring/mbeans/MonitorDomainNames.java
@@ -28,5 +28,6 @@ public enum MonitorDomainNames {
HelixThreadPoolExecutor,
HelixCallback,
RoutingTableProvider,
- CLMParticipantReport
+ CLMParticipantReport,
+ Rebalancer
}