You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/12/20 17:33:09 UTC
hbase git commit: HBASE-19563 A few hbase-procedure classes missing
@InterfaceAudience annotation
Repository: hbase
Updated Branches:
refs/heads/master 55fefd4b5 -> 6c6a9d2d1
HBASE-19563 A few hbase-procedure classes missing @InterfaceAudience annotation
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6c6a9d2d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6c6a9d2d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6c6a9d2d
Branch: refs/heads/master
Commit: 6c6a9d2d1ca7a8ca79dde2e257ed5f2fdd375770
Parents: 55fefd4
Author: Guanghao Zhang <zg...@apache.org>
Authored: Wed Dec 20 16:50:31 2017 +0800
Committer: Michael Stack <st...@apache.org>
Committed: Wed Dec 20 09:33:06 2017 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/procedure2/LockAndQueue.java | 3 +++
.../org/apache/hadoop/hbase/procedure2/LockStatus.java | 12 +++++++++++-
.../hadoop/hbase/procedure2/ProcedureMetrics.java | 2 ++
.../hbase/procedure2/ProcedureStateSerializer.java | 3 +++
.../hbase/procedure2/store/NoopProcedureStore.java | 2 ++
.../hbase/procedure2/store/ProcedureStoreBase.java | 3 +++
6 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockAndQueue.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockAndQueue.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockAndQueue.java
index 89cacef..427c1fc 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockAndQueue.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockAndQueue.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hbase.procedure2;
+import org.apache.yetus.audience.InterfaceAudience;
+
/**
* Locking for mutual exclusion between procedures. Used only by procedure framework internally.
* {@link LockAndQueue} has two purposes:
@@ -42,6 +44,7 @@ package org.apache.hadoop.hbase.procedure2;
* <br>
* We do not use ReentrantReadWriteLock directly because of its high memory overhead.
*/
+@InterfaceAudience.Private
public class LockAndQueue extends ProcedureDeque implements LockStatus {
private Procedure<?> exclusiveLockOwnerProcedure = null;
private int sharedLock = 0;
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockStatus.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockStatus.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockStatus.java
index f32ef76..24d7090 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockStatus.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/LockStatus.java
@@ -18,18 +18,28 @@
package org.apache.hadoop.hbase.procedure2;
+import org.apache.yetus.audience.InterfaceAudience;
+
/**
* Interface to get status of a Lock without getting access to acquire/release lock.
* Currently used in MasterProcedureScheduler where we want to give Queues access to lock's
* status for scheduling purposes, but not the ability to acquire/release it.
*/
+@InterfaceAudience.Private
public interface LockStatus {
boolean isLocked();
+
boolean hasExclusiveLock();
+
boolean isLockOwner(long procId);
+
boolean hasParentLock(final Procedure proc);
+
boolean hasLockAccess(final Procedure proc);
+
Procedure<?> getExclusiveLockOwnerProcedure();
+
long getExclusiveLockProcIdOwner();
+
int getSharedLockCount();
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureMetrics.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureMetrics.java
index 59cf1fe..4841392 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureMetrics.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureMetrics.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.procedure2;
import org.apache.hadoop.hbase.metrics.Counter;
import org.apache.hadoop.hbase.metrics.Histogram;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* With this interface, the procedure framework provides means to collect following set of metrics
@@ -32,6 +33,7 @@ import org.apache.hadoop.hbase.metrics.Histogram;
*
* Please implement this interface to return appropriate metrics.
*/
+@InterfaceAudience.Private
public interface ProcedureMetrics {
/**
* @return Total number of instances submitted for a type of a procedure
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.java
index 03842d9..676aab9 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureStateSerializer.java
@@ -19,8 +19,11 @@ package org.apache.hadoop.hbase.procedure2;
import java.io.IOException;
+import org.apache.yetus.audience.InterfaceAudience;
+
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Message;
+@InterfaceAudience.Private
public interface ProcedureStateSerializer {
void serialize(Message message) throws IOException;
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/NoopProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/NoopProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/NoopProcedureStore.java
index 9e53f42..9c6176d 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/NoopProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/NoopProcedureStore.java
@@ -21,10 +21,12 @@ package org.apache.hadoop.hbase.procedure2.store;
import java.io.IOException;
import org.apache.hadoop.hbase.procedure2.Procedure;
+import org.apache.yetus.audience.InterfaceAudience;
/**
* An In-Memory store that does not keep track of the procedures inserted.
*/
+@InterfaceAudience.Private
public class NoopProcedureStore extends ProcedureStoreBase {
private int numThreads;
http://git-wip-us.apache.org/repos/asf/hbase/blob/6c6a9d2d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreBase.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreBase.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreBase.java
index 847c4d9..90da933 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreBase.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreBase.java
@@ -21,9 +21,12 @@ package org.apache.hadoop.hbase.procedure2.store;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.yetus.audience.InterfaceAudience;
+
/**
* Base class for {@link ProcedureStore}s.
*/
+@InterfaceAudience.Private
public abstract class ProcedureStoreBase implements ProcedureStore {
private final CopyOnWriteArrayList<ProcedureStoreListener> listeners = new CopyOnWriteArrayList<>();