Repository: hbase
Updated Branches:
refs/heads/branch-1 ab48c0413 -> 608bb9e30
HBASE-12189 Fix new issues found by coverity static analysis
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaState.java
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/UserQuotaState.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/608bb9e3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/608bb9e3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/608bb9e3
Branch: refs/heads/branch-1
Commit: 608bb9e308b0cbce018929303e6ec0dfc81d05af
Parents: ab48c04
Author: stack <[email protected]>
Authored: Thu Oct 9 20:51:04 2014 -0700
Committer: stack <[email protected]>
Committed: Thu Oct 9 20:51:52 2014 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/ipc/RpcClient.java | 17 +++++-----
.../org/apache/hadoop/hbase/util/Sleeper.java | 4 ++-
.../java/org/apache/hadoop/hbase/KeyValue.java | 1 +
.../hadoop/hbase/trace/SpanReceiverHost.java | 3 --
.../hadoop/metrics2/impl/JmxCacheBuster.java | 3 +-
.../apache/hadoop/hbase/LocalHBaseCluster.java | 12 ++++---
.../ZKSplitLogManagerCoordination.java | 28 ++++++++++-------
.../errorhandling/TimeoutExceptionInjector.java | 16 +++++-----
.../replication/VerifyReplication.java | 1 +
.../master/balancer/SimpleLoadBalancer.java | 14 ---------
.../hbase/regionserver/DefaultMemStore.java | 5 +++
.../hbase/regionserver/MemStoreChunkPool.java | 3 +-
.../DefaultVisibilityLabelServiceImpl.java | 33 +++++++++++---------
.../org/apache/hadoop/hbase/util/FSUtils.java | 5 +--
.../hadoop/hbase/util/MultiHConnection.java | 15 +++++----
.../hadoop/hbase/util/RegionSplitter.java | 15 ++++++---
.../hbase/master/TestSplitLogManager.java | 7 +++--
17 files changed, 100 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
----------------------------------------------------------------------
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
index 1bfd9a6..522971b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
@@ -110,7 +110,6 @@ import java.util.concurrent.atomic.AtomicInteger;
* Does RPC against a cluster. Manages connections per regionserver in the
cluster.
* <p>See HBaseServer
*/
-@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
@InterfaceAudience.Private
public class RpcClient {
public static final Log LOG = LogFactory.getLog(RpcClient.class);
@@ -374,13 +373,13 @@ public class RpcClient {
/** Thread that reads responses and notifies callers. Each connection owns a
* socket connected to a remote address. Calls are multiplexed through this
* socket: responses may be delivered out of order. */
- @SuppressWarnings("SynchronizeOnNonFinalField")
protected class Connection extends Thread {
private ConnectionHeader header; // connection header
protected ConnectionId remoteId;
protected Socket socket = null; // connected socket
protected DataInputStream in;
- protected DataOutputStream out; // Warning: can be locked inside a class
level lock.
+ protected DataOutputStream out;
+ private Object outLock = new Object();
private InetSocketAddress server; // server ip:port
private String serverPrincipal; // server's krb5 principal name
private AuthMethod authMethod; // authentication method
@@ -972,7 +971,9 @@ public class RpcClient {
}
}
this.in = new DataInputStream(new BufferedInputStream(inStream));
- this.out = new DataOutputStream(new BufferedOutputStream(outStream));
+ synchronized (this.outLock) {
+ this.out = new DataOutputStream(new
BufferedOutputStream(outStream));
+ }
// Now write out the connection header
writeConnectionHeader();
@@ -1021,7 +1022,7 @@ public class RpcClient {
* Write the connection header.
*/
private synchronized void writeConnectionHeader() throws IOException {
- synchronized (this.out) {
+ synchronized (this.outLock) {
this.out.writeInt(this.header.getSerializedSize());
this.header.writeTo(this.out);
this.out.flush();
@@ -1042,8 +1043,8 @@ public class RpcClient {
}
// close the streams and therefore the socket
- if (this.out != null) {
- synchronized(this.out) {
+ synchronized(this.outLock) {
+ if (this.out != null) {
IOUtils.closeStream(out);
this.out = null;
}
@@ -1105,7 +1106,7 @@ public class RpcClient {
// know where we stand, we have to close the connection.
checkIsOpen();
IOException writeException = null;
- synchronized (this.out) {
+ synchronized (this.outLock) {
if (Thread.interrupted()) throw new InterruptedIOException();
calls.put(call.id, call); // We put first as we don't want the
connection to become idle.
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
----------------------------------------------------------------------
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
index fb08302..071250b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java
@@ -110,6 +110,8 @@ public class Sleeper {
woke = (woke == -1)? System.currentTimeMillis(): woke;
waitTime = this.period - (woke - startTime);
}
- triggerWake = false;
+ synchronized(sleepLock) {
+ triggerWake = false;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index cae7580..695f1f5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -2280,6 +2280,7 @@ public class KeyValue implements Cell, HeapSize,
Cloneable, SettableSequenceId,
@Override
protected Object clone() throws CloneNotSupportedException {
+ super.clone();
return new KVComparator();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
----------------------------------------------------------------------
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
index c4a7286..c4fcec4 100644
---
a/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
+++
b/hbase-common/src/main/java/org/apache/hadoop/hbase/trace/SpanReceiverHost.java
@@ -46,9 +46,6 @@ public class SpanReceiverHost {
}
public static SpanReceiverHost getInstance(Configuration conf) {
- if (SingletonHolder.INSTANCE.host != null) {
- return SingletonHolder.INSTANCE.host;
- }
synchronized (SingletonHolder.INSTANCE.lock) {
if (SingletonHolder.INSTANCE.host != null) {
return SingletonHolder.INSTANCE.host;
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
----------------------------------------------------------------------
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
index c851bc4..5d83150 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/impl/JmxCacheBuster.java
@@ -52,9 +52,8 @@ public class JmxCacheBuster {
public static void clearJmxCache() {
//If there are more then 100 ms before the executor will run then
everything should be merged.
- if (fut == null || (!fut.isDone() && fut.getDelay(TimeUnit.MILLISECONDS)
> 100)) return;
-
synchronized (lock) {
+ if (fut == null || (!fut.isDone() &&
fut.getDelay(TimeUnit.MILLISECONDS) > 100)) return;
fut = executor.getExecutor().schedule(new JmxCacheBusterRunnable(), 5,
TimeUnit.SECONDS);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index a8db472..d7fcb3d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -464,9 +464,13 @@ public class LocalHBaseCluster {
LocalHBaseCluster cluster = new LocalHBaseCluster(conf);
cluster.startup();
Admin admin = new HBaseAdmin(conf);
- HTableDescriptor htd =
- new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));
- admin.createTable(htd);
+ try {
+ HTableDescriptor htd =
+ new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));
+ admin.createTable(htd);
+ } finally {
+ admin.close();
+ }
cluster.shutdown();
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
index e2d02a1..0fb5c59 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
@@ -264,7 +264,7 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
// might miss the watch-trigger that creation of RESCAN node provides.
// Since the TimeoutMonitor will keep resubmitting UNASSIGNED tasks
// therefore this behavior is safe.
- SplitLogTask slt = new SplitLogTask.Done(this.details.getServerName(),
this.recoveryMode);
+ SplitLogTask slt = new SplitLogTask.Done(this.details.getServerName(),
getRecoveryMode());
this.watcher
.getRecoverableZooKeeper()
.getZooKeeper()
@@ -424,7 +424,7 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
}
private void createNode(String path, Long retry_count) {
- SplitLogTask slt = new SplitLogTask.Unassigned(details.getServerName(),
this.recoveryMode);
+ SplitLogTask slt = new SplitLogTask.Unassigned(details.getServerName(),
getRecoveryMode());
ZKUtil.asyncCreate(this.watcher, path, slt.toByteArray(), new
CreateAsyncCallback(),
retry_count);
SplitLogCounters.tot_mgr_node_create_queued.incrementAndGet();
@@ -757,12 +757,12 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
}
@Override
- public boolean isReplaying() {
+ public synchronized boolean isReplaying() {
return this.recoveryMode == RecoveryMode.LOG_REPLAY;
}
@Override
- public boolean isSplitting() {
+ public synchronized boolean isSplitting() {
return this.recoveryMode == RecoveryMode.LOG_SPLITTING;
}
@@ -774,15 +774,19 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
*/
@Override
public void setRecoveryMode(boolean isForInitialization) throws IOException {
- if (this.isDrainingDone) {
- // when there is no outstanding splitlogtask after master start up, we
already have up to date
- // recovery mode
- return;
+ synchronized(this) {
+ if (this.isDrainingDone) {
+ // when there is no outstanding splitlogtask after master start up, we
already have up to date
+ // recovery mode
+ return;
+ }
}
if (this.watcher == null) {
// when watcher is null(testing code) and recovery mode can only be
LOG_SPLITTING
- this.isDrainingDone = true;
- this.recoveryMode = RecoveryMode.LOG_SPLITTING;
+ synchronized(this) {
+ this.isDrainingDone = true;
+ this.recoveryMode = RecoveryMode.LOG_SPLITTING;
+ }
return;
}
boolean hasSplitLogTask = false;
@@ -877,7 +881,7 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
try {
// blocking zk call but this is done from the timeout thread
SplitLogTask slt =
- new SplitLogTask.Unassigned(this.details.getServerName(),
this.recoveryMode);
+ new SplitLogTask.Unassigned(this.details.getServerName(),
getRecoveryMode());
if (ZKUtil.setData(this.watcher, path, slt.toByteArray(), version) ==
false) {
LOG.debug("failed to resubmit task " + path + " version changed");
return false;
@@ -1105,7 +1109,7 @@ public class ZKSplitLogManagerCoordination extends
ZooKeeperListener implements
}
@Override
- public RecoveryMode getRecoveryMode() {
+ public synchronized RecoveryMode getRecoveryMode() {
return recoveryMode;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java
index 6dccd3d..43dd68d 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/errorhandling/TimeoutExceptionInjector.java
@@ -23,7 +23,6 @@ import java.util.TimerTask;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
/**
@@ -80,14 +79,15 @@ public class TimeoutExceptionInjector {
* For all time forward, do not throw an error because the process has
completed.
*/
public void complete() {
- // warn if the timer is already marked complete. This isn't going to be
thread-safe, but should
- // be good enough and its not worth locking just for a warning.
- if (this.complete) {
- LOG.warn("Timer already marked completed, ignoring!");
- return;
- }
- LOG.debug("Marking timer as complete - no error notifications will be
received for this timer.");
synchronized (this.timerTask) {
+ if (this.complete) {
+ LOG.warn("Timer already marked completed, ignoring!");
+ return;
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Marking timer as complete - no error notifications will be
received for " +
+ "this timer.");
+ }
this.complete = true;
}
this.timer.cancel();
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
index a325f74..f94dac9 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
@@ -127,6 +127,7 @@ public class VerifyReplication extends Configured
implements Tool {
ZKUtil.applyClusterKeyToConf(peerConf, zkClusterKey);
TableName tableName = TableName.valueOf(conf.get(NAME +
".tableName"));
+ // TODO: THis HTable doesn't get closed. Fix!
Table replicatedTable = new HTable(peerConf, tableName);
scan.setStartRow(value.getRow());
scan.setStopRow(tableSplit.getEndRow());
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java
index 25e8a43..4131f92 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/SimpleLoadBalancer.java
@@ -194,7 +194,6 @@ public class SimpleLoadBalancer extends BaseLoadBalancer {
clusterMap.remove(masterServerName);
}
- boolean emptyRegionServerPresent = false;
long startTime = System.currentTimeMillis();
// construct a Cluster object with clusterMap and rest of the
@@ -256,10 +255,6 @@ public class SimpleLoadBalancer extends BaseLoadBalancer {
regionsToMove.add(new RegionPlan(hri, sal.getServerName(), null));
numTaken++;
if (numTaken >= numToOffload) break;
- // fetch in alternate order if there is new region server
- if (emptyRegionServerPresent) {
- fetchFromTail = !fetchFromTail;
- }
}
serverBalanceInfo.put(sal.getServerName(),
new BalanceInfo(numToOffload, (-1)*numTaken));
@@ -303,9 +298,6 @@ public class SimpleLoadBalancer extends BaseLoadBalancer {
if (numToTake == 0) continue;
addRegionPlan(regionsToMove, fetchFromTail, si, regionsToReturn);
- if (emptyRegionServerPresent) {
- fetchFromTail = !fetchFromTail;
- }
underloadedServers.put(si, numToTake-1);
cnt++;
@@ -381,9 +373,6 @@ public class SimpleLoadBalancer extends BaseLoadBalancer {
addRegionPlan(regionsToMove, fetchFromTail,
server.getKey().getServerName(), regionsToReturn);
numTaken++;
- if (emptyRegionServerPresent) {
- fetchFromTail = !fetchFromTail;
- }
}
}
@@ -401,9 +390,6 @@ public class SimpleLoadBalancer extends BaseLoadBalancer {
}
addRegionPlan(regionsToMove, fetchFromTail,
server.getKey().getServerName(), regionsToReturn);
- if (emptyRegionServerPresent) {
- fetchFromTail = !fetchFromTail;
- }
if (regionsToMove.isEmpty()) {
break;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
index fddfdca..48b78c2 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultMemStore.java
@@ -733,6 +733,11 @@ public class DefaultMemStore implements MemStore {
}
}
+ /**
+ * Lock on 'this' must be held by caller.
+ * @param it
+ * @return Next Cell
+ */
private Cell getNext(Iterator<Cell> it) {
Cell startCell = theNext;
Cell v = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreChunkPool.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreChunkPool.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreChunkPool.java
index fefc951..87710df 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreChunkPool.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreChunkPool.java
@@ -50,6 +50,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
* bytes, and {@link MemStoreChunkPool#putbackChunks(BlockingQueue)} is called
* when MemStore clearing snapshot for flush
*/
+@SuppressWarnings("javadoc")
@InterfaceAudience.Private
public class MemStoreChunkPool {
private static final Log LOG = LogFactory.getLog(MemStoreChunkPool.class);
@@ -180,9 +181,9 @@ public class MemStoreChunkPool {
*/
static MemStoreChunkPool getPool(Configuration conf) {
if (globalInstance != null) return globalInstance;
- if (chunkPoolDisabled) return null;
synchronized (MemStoreChunkPool.class) {
+ if (chunkPoolDisabled) return null;
if (globalInstance != null) return globalInstance;
float poolSizePercentage = conf.getFloat(CHUNK_POOL_MAXSIZE_KEY,
POOL_MAX_SIZE_DEFAULT);
if (poolSizePercentage <= 0) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java
index 2cbbdda..e94760e 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/DefaultVisibilityLabelServiceImpl.java
@@ -35,6 +35,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -72,7 +73,7 @@ public class DefaultVisibilityLabelServiceImpl implements
VisibilityLabelService
private static final Tag[] LABELS_TABLE_TAGS = new Tag[1];
private static final byte[] DUMMY_VALUE = new byte[0];
- private volatile int ordinalCounter = -1;
+ private AtomicInteger ordinalCounter = new AtomicInteger(-1);
private Configuration conf;
private HRegion labelsRegion;
private VisibilityLabelsCache labelsCache;
@@ -127,7 +128,7 @@ public class DefaultVisibilityLabelServiceImpl implements
VisibilityLabelService
ordinal = i;
}
}
- this.ordinalCounter = ordinal + 1;
+ this.ordinalCounter.set(ordinal + 1);
if (labels.size() > 0) {
// If there is no data need not write to zk
byte[] serialized = VisibilityUtils.getDataToWriteToZooKeeper(labels);
@@ -239,13 +240,13 @@ public class DefaultVisibilityLabelServiceImpl implements
VisibilityLabelService
finalOpStatus[i] = new OperationStatus(OperationStatusCode.FAILURE,
new LabelAlreadyExistsException("Label '" + labelStr + "' already
exists"));
} else {
- Put p = new Put(Bytes.toBytes(ordinalCounter));
+ Put p = new Put(Bytes.toBytes(ordinalCounter.get()));
p.addImmutable(LABELS_TABLE_FAMILY, LABEL_QUALIFIER, label,
LABELS_TABLE_TAGS);
if (LOG.isDebugEnabled()) {
LOG.debug("Adding the label " + labelStr);
}
puts.add(p);
- ordinalCounter++;
+ ordinalCounter.incrementAndGet();
}
i++;
}
@@ -350,17 +351,21 @@ public class DefaultVisibilityLabelServiceImpl implements
VisibilityLabelService
s.setFilter(filter);
List<String> auths = new ArrayList<String>();
RegionScanner scanner = this.labelsRegion.getScanner(s);
- List<Cell> results = new ArrayList<Cell>(1);
- while (true) {
- scanner.next(results);
- if (results.isEmpty()) break;
- Cell cell = results.get(0);
- int ordinal = Bytes.toInt(cell.getRowArray(), cell.getRowOffset(),
cell.getRowLength());
- String label = this.labelsCache.getLabel(ordinal);
- if (label != null) {
- auths.add(label);
+ try {
+ List<Cell> results = new ArrayList<Cell>(1);
+ while (true) {
+ scanner.next(results);
+ if (results.isEmpty()) break;
+ Cell cell = results.get(0);
+ int ordinal = Bytes.toInt(cell.getRowArray(), cell.getRowOffset(),
cell.getRowLength());
+ String label = this.labelsCache.getLabel(ordinal);
+ if (label != null) {
+ auths.add(label);
+ }
+ results.clear();
}
- results.clear();
+ } finally {
+ scanner.close();
}
return auths;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
index 51af440..e35868c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
@@ -1075,10 +1075,11 @@ public abstract class FSUtils {
}
// compute percentage per table and store in result list
frags.put(FSUtils.getTableName(d).getNameAsString(),
- Math.round((float) cfFrag / cfCount * 100));
+ cfCount == 0? 0: Math.round((float) cfFrag / cfCount * 100));
}
// set overall percentage for all tables
- frags.put("-TOTAL-", Math.round((float) cfFragTotal / cfCountTotal * 100));
+ frags.put("-TOTAL-",
+ cfCountTotal == 0? 0: Math.round((float) cfFragTotal / cfCountTotal *
100));
return frags;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
index 27b0048..1dc9c31 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
@@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.client.coprocessor.Batch;
public class MultiHConnection {
private static final Log LOG = LogFactory.getLog(MultiHConnection.class);
private HConnection[] hConnections;
+ private final Object hConnectionsLock = new Object();
private int noOfConnections;
private ExecutorService batchPool;
@@ -60,10 +61,12 @@ public class MultiHConnection {
public MultiHConnection(Configuration conf, int noOfConnections)
throws IOException {
this.noOfConnections = noOfConnections;
- hConnections = new HConnection[noOfConnections];
- for (int i = 0; i < noOfConnections; i++) {
- HConnection conn = HConnectionManager.createConnection(conf);
- hConnections[i] = conn;
+ synchronized (this.hConnectionsLock) {
+ hConnections = new HConnection[noOfConnections];
+ for (int i = 0; i < noOfConnections; i++) {
+ HConnection conn = HConnectionManager.createConnection(conf);
+ hConnections[i] = conn;
+ }
}
createBatchPool(conf);
}
@@ -72,8 +75,8 @@ public class MultiHConnection {
* Close the open connections and shutdown the batchpool
*/
public void close() {
- if (hConnections != null) {
- synchronized (hConnections) {
+ synchronized (hConnectionsLock) {
+ if (hConnections != null) {
if (hConnections != null) {
for (Connection conn : hConnections) {
if (conn != null) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
index 064f67c..0a75a16 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionSplitter.java
@@ -379,10 +379,13 @@ public class RegionSplitter {
desc.addFamily(new HColumnDescriptor(Bytes.toBytes(cf)));
}
HBaseAdmin admin = new HBaseAdmin(conf);
- Preconditions.checkArgument(!admin.tableExists(tableName),
+ try {
+ Preconditions.checkArgument(!admin.tableExists(tableName),
"Table already exists: " + tableName);
- admin.createTable(desc, splitAlgo.split(splitCount));
- admin.close();
+ admin.createTable(desc, splitAlgo.split(splitCount));
+ } finally {
+ admin.close();
+ }
LOG.debug("Table created! Waiting for regions to show online in META...");
if (!conf.getBoolean("split.verify", true)) {
// NOTE: createTable is synchronous on the table, but not on the regions
@@ -529,7 +532,11 @@ public class RegionSplitter {
byte[] split = dr.getSecond();
LOG.debug("Splitting at " + splitAlgo.rowToStr(split));
HBaseAdmin admin = new HBaseAdmin(table.getConfiguration());
- admin.split(table.getTableName(), split);
+ try {
+ admin.split(table.getTableName(), split);
+ } finally {
+ admin.close();
+ }
LinkedList<Pair<byte[], byte[]>> finished = Lists.newLinkedList();
LinkedList<Pair<byte[], byte[]>> local_finished =
Lists.newLinkedList();
http://git-wip-us.apache.org/repos/asf/hbase/blob/608bb9e3/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index 25de362..e61e0c2 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -643,11 +643,12 @@ public class TestSplitLogManager {
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
slm = new SplitLogManager(ds, testConf, stopper, master, DUMMY_MASTER);
+ LOG.info("Mode1=" + slm.getRecoveryMode());
assertTrue(slm.isLogSplitting());
-
zkw.getRecoverableZooKeeper().delete(ZKSplitLog.getEncodedNodeName(zkw,
"testRecovery"), -1);
+ LOG.info("Mode2=" + slm.getRecoveryMode());
slm.setRecoveryMode(false);
- assertTrue(slm.isLogReplaying());
+ LOG.info("Mode3=" + slm.getRecoveryMode());
+ assertTrue("Mode4=" + slm.getRecoveryMode(), slm.isLogReplaying());
}
-
}
