Repository: hbase Updated Branches: refs/heads/HBASE-20952 c738e1575 -> 6e709cf16
HBASE-21599 Fix a findbugs issue and some incorrect javadoc links Signed-off-by: Ankit Singhal <ankitsingha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e709cf1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e709cf1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e709cf1 Branch: refs/heads/HBASE-20952 Commit: 6e709cf16498855038fdcc5371b816d468e308ec Parents: c738e15 Author: Josh Elser <els...@apache.org> Authored: Thu Dec 13 17:31:48 2018 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 3 12:52:49 2019 -0500 ---------------------------------------------------------------------- .../regionserver/ReplicationSourceManager.java | 5 +- .../hadoop/hbase/wal/DisabledWALProvider.java | 52 ++++++++++---------- 2 files changed, 30 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6e709cf1/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java index b948d7e..dd31a01 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java @@ -94,7 +94,8 @@ import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFacto * operations.</li> * <li>Need synchronized on {@link #walsById}. There are four methods which modify it, * {@link #addPeer(String)}, {@link #removePeer(String)}, - * {@link #cleanOldLogs(String, boolean, ReplicationSourceInterface)} and {@link #preLogRoll(Path)}. + * {@link #cleanOldLogs(String, boolean, ReplicationSourceInterface)} and + * {@link #preLogRoll(WALIdentity)}. * {@link #walsById} is a ConcurrentHashMap and there is a Lock for peer id in * {@link PeerProcedureHandlerImpl}. So there is no race between {@link #addPeer(String)} and * {@link #removePeer(String)}. {@link #cleanOldLogs(String, boolean, ReplicationSourceInterface)} @@ -102,7 +103,7 @@ import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFacto * {@link #removePeer(String)} will terminate the {@link ReplicationSourceInterface} firstly, then * remove the wals from {@link #walsById}. So no race with {@link #removePeer(String)}. The only * case need synchronized is {@link #cleanOldLogs(String, boolean, ReplicationSourceInterface)} and - * {@link #preLogRoll(Path)}.</li> + * {@link #preLogRoll(WALIdentity)}.</li> * <li>No need synchronized on {@link #walsByIdRecoveredQueues}. There are three methods which * modify it, {@link #removePeer(String)} , * {@link #cleanOldLogs(String, boolean, ReplicationSourceInterface)} and http://git-wip-us.apache.org/repos/asf/hbase/blob/6e709cf1/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java index 8dee012..8822f29 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java @@ -27,7 +27,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.PrivateCellUtil; @@ -35,7 +34,6 @@ import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl.WriteEntry; import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener; import org.apache.hadoop.hbase.regionserver.wal.WALCoprocessorHost; -import org.apache.hadoop.hbase.util.FSUtils; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,6 +51,32 @@ class DisabledWALProvider implements WALProvider { private static final Logger LOG = LoggerFactory.getLogger(DisabledWALProvider.class); + private static final WALIdentity DISABLED_WAL_IDENTITY = new WALIdentity() { + @Override + public int compareTo(WALIdentity o) { + if (equals(o)) { + return 0; + } + return 1; + } + + @Override + public String getName() { + return "disabled-wal-id"; + } + + @Override + public boolean equals(Object o) { + return this == o; + } + + @Override + public int hashCode() { + return 0; + } + }; + + WAL disabled; @Override @@ -63,29 +87,7 @@ class DisabledWALProvider implements WALProvider { if (null == providerId) { providerId = "defaultDisabled"; } - final Path path = new Path(FSUtils.getWALRootDir(conf), providerId); - disabled = new DisabledWAL(new WALIdentity() { - - @Override - public int compareTo(WALIdentity o) { - return 0; - } - - @Override - public String getName() { - return path.getName(); - } - - @Override - public boolean equals(Object obj) { - return true; - } - - @Override - public int hashCode() { - return 0; - } - }, conf, null); + disabled = new DisabledWAL(DISABLED_WAL_IDENTITY, conf, null); } @Override
