You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bh...@apache.org on 2020/05/31 21:15:01 UTC
[hbase] branch branch-2 updated: HBASE-24477: Move
ConfigurationObserver and related classes to hbase-common
This is an automated email from the ASF dual-hosted git repository.
bharathv pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new d7f3885 HBASE-24477: Move ConfigurationObserver and related classes to hbase-common
d7f3885 is described below
commit d7f388518c99640b7088efed23f3c236ff0acb44
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Fri Dec 13 15:53:33 2019 -0800
HBASE-24477: Move ConfigurationObserver and related classes to hbase-common
This utility is useful for any module that wants to detect
dynamic config changes. Having it to hbase-common makes it
accessible to all the other modules.
Signed-off-by: Michael Stack <st...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hadoop/hbase/conf/ConfigurationManager.java | 19 +++++++------------
.../hadoop/hbase/conf/ConfigurationObserver.java | 0
.../hbase/conf/PropagatingConfigurationObserver.java | 0
.../hadoop/hbase/conf/TestConfigurationManager.java | 0
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java
similarity index 93%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java
index 555a5c0..755f8c1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationManager.java
@@ -17,16 +17,15 @@
*/
package org.apache.hadoop.hbase.conf;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collections;
-import java.util.Set;
-import java.util.WeakHashMap;
-
/**
* Maintains the set of all the classes which would like to get notified
* when the Configuration is reloaded from the disk in the Online Configuration
@@ -56,9 +55,7 @@ import java.util.WeakHashMap;
* 2. Register the appropriate instance of the class with the
* {@link ConfigurationManager} instance, using the
* {@link ConfigurationManager#registerObserver(ConfigurationObserver)}
- * method. For the RS side of things, the ConfigurationManager is a static
- * member of the {@link org.apache.hadoop.hbase.regionserver.HRegionServer}
- * class. Be careful not to do this in the constructor, as you might cause
+ * method. Be careful not to do this in the constructor, as you might cause
* the 'this' reference to escape. Use a factory method, or an initialize()
* method which is called after the construction of the object.
*
@@ -68,7 +65,6 @@ import java.util.WeakHashMap;
* for any reason, it is still okay, since entries for dead observers are
* automatically collected during GC. But nonetheless, it is still a good
* practice to deregister your observer, whenever possible.
- *
*/
@InterfaceAudience.Private
@InterfaceStability.Evolving
@@ -80,12 +76,11 @@ public class ConfigurationManager {
// constructed from a WeakHashMap, whose entries would be removed if the
// observer classes go out of scope.
private final Set<ConfigurationObserver> configurationObservers =
- Collections.newSetFromMap(new WeakHashMap<ConfigurationObserver,
- Boolean>());
+ Collections.newSetFromMap(new WeakHashMap<>());
/**
* Register an observer class
- * @param observer
+ * @param observer observer to be registered.
*/
public void registerObserver(ConfigurationObserver observer) {
synchronized (configurationObservers) {
@@ -98,7 +93,7 @@ public class ConfigurationManager {
/**
* Deregister an observer class
- * @param observer
+ * @param observer to be deregistered.
*/
public void deregisterObserver(ConfigurationObserver observer) {
synchronized (configurationObservers) {
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationObserver.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationObserver.java
similarity index 100%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationObserver.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/conf/ConfigurationObserver.java
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/conf/PropagatingConfigurationObserver.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/conf/PropagatingConfigurationObserver.java
similarity index 100%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/conf/PropagatingConfigurationObserver.java
rename to hbase-common/src/main/java/org/apache/hadoop/hbase/conf/PropagatingConfigurationObserver.java
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java
similarity index 100%
rename from hbase-server/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java
rename to hbase-common/src/test/java/org/apache/hadoop/hbase/conf/TestConfigurationManager.java