svn commit: r1484925 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

[stack]

Author: stack
Date: Tue May 21 20:02:50 2013
New Revision: 1484925

URL: http://svn.apache.org/r1484925
Log:
HBASE-8586 Revisit of hbase-8483, HConnectionManager can leak ZooKeeper 
connections when using deleteStaleConnection

Modified:

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1484925r1=1484924r2=1484925view=diff
==
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
 Tue May 21 20:02:50 2013
@@ -817,7 +817,7 @@ public class TestHCM {
 config.setInt(zookeeper.recovery.retry, 1);
 config.setInt(zookeeper.recovery.retry.intervalmill, 1000);
 config.setInt(hbase.rpc.timeout, 2000);
-config.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
+config.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1);
 
 ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10,
   5, TimeUnit.SECONDS,
@@ -866,7 +866,7 @@ public class TestHCM {
   if 
(((ZooKeeperWatcher)watcher).getRecoverableZooKeeper().getState().isAlive()) {
 // non-synchronized access to watcher; sleep and check again 
in case zk connection
 // hasn't been cleaned up yet.
-Thread.sleep(50);
+Thread.sleep(1000);
 if (((ZooKeeperWatcher) 
watcher).getRecoverableZooKeeper().getState().isAlive()) {
   pool.shutdownNow();
   fail(Live zookeeper in closed connection);

svn commit: r1484939 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/test/java/org/apache

[stack]

Author: stack
Date: Tue May 21 20:28:55 2013
New Revision: 1484939

URL: http://svn.apache.org/r1484939
Log:
HBASE-8581 rpc refactor dropped passing the operation timeout through to the 
rpcclient

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java

hbase/branches/0.95/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java

hbase/branches/0.95/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1484939r1=1484938r2=1484939view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
 Tue May 21 20:28:55 2013
@@ -243,9 +243,11 @@ public class HTable implements HTableInt
*/
   private void finishSetup() throws IOException {
 this.connection.locateRegion(tableName, HConstants.EMPTY_START_ROW);
-this.operationTimeout = HTableDescriptor.isMetaTable(tableName) ? 
HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT
-: this.configuration.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
-HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
+this.operationTimeout = HTableDescriptor.isMetaTable(tableName) ?
+  this.configuration.getInt(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
+HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT):
+  this.configuration.getInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
+HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT);
 this.writeBufferSize = this.configuration.getLong(
 hbase.client.write.buffer, 2097152);
 this.clearBufferOnFail = true;
@@ -547,8 +549,7 @@ public class HTable implements HTableInt
 if (scan.getCaching() = 0) {
   scan.setCaching(getScannerCaching());
 }
-return new ClientScanner(getConfiguration(), scan, getTableName(),
-this.connection);
+return new ClientScanner(getConfiguration(), scan, getTableName(), 
this.connection);
   }
 
   /**
@@ -888,6 +889,7 @@ public class HTable implements HTableInt
 try {
   GetRequest request = RequestConverter.buildGetRequest(
   location.getRegionInfo().getRegionName(), get, true);
+
   GetResponse response = stub.get(null, request);
   return response.getExists();
 } catch (ServiceException se) {

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1484939r1=1484938r2=1484939view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 Tue May 21 20:28:55 2013
@@ -206,13 +206,13 @@ public abstract class ServerCallableT 
 }
 
 // If, after the planned sleep, there won't be enough time left, we 
stop now.
-if (((this.endTime - this.globalStartTime) + MIN_RPC_TIMEOUT + 
expectedSleep) 
-this.callTimeout) {
+long duration = singleCallDuration(expectedSleep);
+if (duration  this.callTimeout) {
   throw (SocketTimeoutException) new SocketTimeoutException(
   Call to access row ' + Bytes.toString(row) + ' on table '
   + Bytes.toString(tableName)
   + ' failed on timeout.  +  callTimeout= + 
this.callTimeout +
-  , time= + (this.endTime - this.startTime)).initCause(t);
+  , callDuration= + duration).initCause(t);
 }
   } finally {
 afterCall();
@@ -227,6 +227,14 @@ public abstract class ServerCallableT 
   }
 
   /**
+   * @param expectedSleep
+   * @return Calculate how long a single call took
+   */
+  private long singleCallDuration(final long expectedSleep) {
+return (this.endTime - this.globalStartTime) + MIN_RPC_TIMEOUT + 
expectedSleep;
+  }
+
+  /**
* Run this instance against the server once.
* @return an object of type T
* @throws IOException if a remote or network exception occurs

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
URL: 
http

svn commit: r1484953 - /hbase/trunk/src/main/docbkx/security.xml

[stack]

Author: stack
Date: Tue May 21 20:55:56 2013
New Revision: 1484953

URL: http://svn.apache.org/r1484953
Log:
HBASE-8588 [Documentation]: Add information about adding REST and Thrift API 
kerberos principals to HBase ACL table

Modified:
hbase/trunk/src/main/docbkx/security.xml

Modified: hbase/trunk/src/main/docbkx/security.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/security.xml?rev=1484953r1=1484952r2=1484953view=diff
==
Binary files - no diff available.

svn commit: r1485067 - in /hbase/trunk/src/main/docbkx: configuration.xml ops_mgt.xml performance.xml schema_design.xml troubleshooting.xml

[stack]

Author: stack
Date: Wed May 22 05:37:08 2013
New Revision: 1485067

URL: http://svn.apache.org/r1485067
Log:
HBASE-8592 [documentation] some updates for the reference guide regarding 
recent questions on the ML

Modified:
hbase/trunk/src/main/docbkx/configuration.xml
hbase/trunk/src/main/docbkx/ops_mgt.xml
hbase/trunk/src/main/docbkx/performance.xml
hbase/trunk/src/main/docbkx/schema_design.xml
hbase/trunk/src/main/docbkx/troubleshooting.xml

Modified: hbase/trunk/src/main/docbkx/configuration.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/configuration.xml?rev=1485067r1=1485066r2=1485067view=diff
==
Binary files - no diff available.

Modified: hbase/trunk/src/main/docbkx/ops_mgt.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/ops_mgt.xml?rev=1485067r1=1485066r2=1485067view=diff
==
Binary files - no diff available.

Modified: hbase/trunk/src/main/docbkx/performance.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/performance.xml?rev=1485067r1=1485066r2=1485067view=diff
==
Binary files - no diff available.

Modified: hbase/trunk/src/main/docbkx/schema_design.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/schema_design.xml?rev=1485067r1=1485066r2=1485067view=diff
==
Binary files - no diff available.

Modified: hbase/trunk/src/main/docbkx/troubleshooting.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/troubleshooting.xml?rev=1485067r1=1485066r2=1485067view=diff
==
Binary files - no diff available.

svn commit: r1485068 - /hbase/trunk/src/main/site/xdoc/replication.xml

[stack]

Author: stack
Date: Wed May 22 05:38:16 2013
New Revision: 1485068

URL: http://svn.apache.org/r1485068
Log:
HBASE-8591 Doc Improvement: Replication blog

Modified:
hbase/trunk/src/main/site/xdoc/replication.xml

Modified: hbase/trunk/src/main/site/xdoc/replication.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/site/xdoc/replication.xml?rev=1485068r1=1485067r2=1485068view=diff
==
Binary files - no diff available.

svn commit: r1485395 - /hbase/trunk/src/main/docbkx/troubleshooting.xml

[stack]

Author: stack
Date: Wed May 22 20:13:57 2013
New Revision: 1485395

URL: http://svn.apache.org/r1485395
Log:
DOC: Add missing section, fix duplicate xml:id

Modified:
hbase/trunk/src/main/docbkx/troubleshooting.xml

Modified: hbase/trunk/src/main/docbkx/troubleshooting.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/troubleshooting.xml?rev=1485395r1=1485394r2=1485395view=diff
==
Binary files - no diff available.

svn commit: r1485396 [2/2] - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-protocol/src/main/java/org/a

[stack]

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java?rev=1485396r1=1485395r2=1485396view=diff
==
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 Wed May 22 20:14:59 2013
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hadoop.hbase.CellScannable;
+import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
@@ -50,6 +52,7 @@ import org.apache.hadoop.hbase.exception
 import org.apache.hadoop.hbase.executor.EventType;
 import org.apache.hadoop.hbase.executor.ExecutorService;
 import org.apache.hadoop.hbase.executor.ExecutorType;
+import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
 import org.apache.hadoop.hbase.master.RegionState.State;
 import org.apache.hadoop.hbase.master.TableLockManager.NullTableLockManager;
 import org.apache.hadoop.hbase.master.balancer.DefaultLoadBalancer;
@@ -60,6 +63,7 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse;
+import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultCellMeta;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
 import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Table;
@@ -81,6 +85,8 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
@@ -594,12 +600,25 @@ public class TestAssignmentManager {
   r = MetaMockingUtil.getMetaTableRowResult(REGIONINFO, SERVERNAME_A);
 }
 
-ScanResponse.Builder builder = ScanResponse.newBuilder();
+final ScanResponse.Builder builder = ScanResponse.newBuilder();
 builder.setMoreResults(true);
-builder.addResult(ProtobufUtil.toResult(r));
+ResultCellMeta.Builder metaBuilder = ResultCellMeta.newBuilder();
+metaBuilder.addCellsLength(r.size());
+builder.setResultCellMeta(metaBuilder.build());
+final ListCellScannable cellScannables = new ArrayListCellScannable(1);
+cellScannables.add(r);
 Mockito.when(implementation.scan(
   (RpcController)Mockito.any(), (ScanRequest)Mockito.any())).
-thenReturn(builder.build());
+  thenAnswer(new AnswerScanResponse() {
+  public ScanResponse answer(InvocationOnMock invocation) throws 
Throwable {
+PayloadCarryingRpcController controller = 
(PayloadCarryingRpcController) invocation
+.getArguments()[0];
+if (controller != null) {
+  
controller.setCellScanner(CellUtil.createCellScanner(cellScannables));
+}
+return builder.build();
+  }
+  });
 
 // Get a connection w/ mocked up common methods.
 HConnection connection =
@@ -1052,17 +1071,30 @@ public class TestAssignmentManager {
   Mockito.mock(ClientProtos.ClientService.BlockingInterface.class);
 // Get a meta row result that has region up on SERVERNAME_A for REGIONINFO
 Result r = MetaMockingUtil.getMetaTableRowResult(REGIONINFO, SERVERNAME_A);
-ScanResponse.Builder builder = ScanResponse.newBuilder();
+final ScanResponse.Builder builder = ScanResponse.newBuilder();
 builder.setMoreResults(true);
-builder.addResult(ProtobufUtil.toResult(r));
+ResultCellMeta.Builder metaBuilder = ResultCellMeta.newBuilder();
+metaBuilder.addCellsLength(r.size());
+builder.setResultCellMeta(metaBuilder.build());
+final ListCellScannable rows = new ArrayListCellScannable(1);
+rows.add(r);
+AnswerScanResponse ans = new AnswerClientProtos.ScanResponse() {
+  public ScanResponse answer(InvocationOnMock invocation) throws Throwable 
{
+PayloadCarryingRpcController controller = 
(PayloadCarryingRpcController) invocation
+.getArguments()[0];
+if (controller != null) {
+  controller.setCellScanner(CellUtil.createCellScanner(rows));
+}
+return builder.build();
+  }
+};
 if (enabling) {
   

svn commit: r1485397 [2/2] - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-protocol/src/main/ja

[stack]

Modified: 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java?rev=1485397r1=1485396r2=1485397view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 Wed May 22 20:15:33 2013
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hadoop.hbase.CellScannable;
+import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
@@ -50,6 +52,7 @@ import org.apache.hadoop.hbase.exception
 import org.apache.hadoop.hbase.executor.EventType;
 import org.apache.hadoop.hbase.executor.ExecutorService;
 import org.apache.hadoop.hbase.executor.ExecutorType;
+import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
 import org.apache.hadoop.hbase.master.RegionState.State;
 import org.apache.hadoop.hbase.master.TableLockManager.NullTableLockManager;
 import org.apache.hadoop.hbase.master.balancer.DefaultLoadBalancer;
@@ -60,6 +63,7 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse;
+import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultCellMeta;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
 import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Table;
@@ -81,6 +85,8 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
@@ -594,12 +600,25 @@ public class TestAssignmentManager {
   r = MetaMockingUtil.getMetaTableRowResult(REGIONINFO, SERVERNAME_A);
 }
 
-ScanResponse.Builder builder = ScanResponse.newBuilder();
+final ScanResponse.Builder builder = ScanResponse.newBuilder();
 builder.setMoreResults(true);
-builder.addResult(ProtobufUtil.toResult(r));
+ResultCellMeta.Builder metaBuilder = ResultCellMeta.newBuilder();
+metaBuilder.addCellsLength(r.size());
+builder.setResultCellMeta(metaBuilder.build());
+final ListCellScannable cellScannables = new ArrayListCellScannable(1);
+cellScannables.add(r);
 Mockito.when(implementation.scan(
   (RpcController)Mockito.any(), (ScanRequest)Mockito.any())).
-thenReturn(builder.build());
+  thenAnswer(new AnswerScanResponse() {
+  public ScanResponse answer(InvocationOnMock invocation) throws 
Throwable {
+PayloadCarryingRpcController controller = 
(PayloadCarryingRpcController) invocation
+.getArguments()[0];
+if (controller != null) {
+  
controller.setCellScanner(CellUtil.createCellScanner(cellScannables));
+}
+return builder.build();
+  }
+  });
 
 // Get a connection w/ mocked up common methods.
 HConnection connection =
@@ -1052,17 +1071,30 @@ public class TestAssignmentManager {
   Mockito.mock(ClientProtos.ClientService.BlockingInterface.class);
 // Get a meta row result that has region up on SERVERNAME_A for REGIONINFO
 Result r = MetaMockingUtil.getMetaTableRowResult(REGIONINFO, SERVERNAME_A);
-ScanResponse.Builder builder = ScanResponse.newBuilder();
+final ScanResponse.Builder builder = ScanResponse.newBuilder();
 builder.setMoreResults(true);
-builder.addResult(ProtobufUtil.toResult(r));
+ResultCellMeta.Builder metaBuilder = ResultCellMeta.newBuilder();
+metaBuilder.addCellsLength(r.size());
+builder.setResultCellMeta(metaBuilder.build());
+final ListCellScannable rows = new ArrayListCellScannable(1);
+rows.add(r);
+AnswerScanResponse ans = new AnswerClientProtos.ScanResponse() {
+  public ScanResponse answer(InvocationOnMock invocation) throws Throwable 
{
+PayloadCarryingRpcController controller = 
(PayloadCarryingRpcController) invocation
+.getArguments()[0];
+if (controller != null) {
+  controller.setCellScanner(CellUtil.createCellScanner(rows));
+}
+return builder.build();
+  }
+};
 if (enabling) {
   

svn commit: r1485401 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java

[stack]

Author: stack
Date: Wed May 22 20:21:13 2013
New Revision: 1485401

URL: http://svn.apache.org/r1485401
Log:
HBASE-8336 PooledHTable may be returned multiple times to the same pool

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java

hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java?rev=1485401r1=1485400r2=1485401view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
 Wed May 22 20:21:13 2013
@@ -324,138 +324,165 @@ public class HTablePool implements Close
*/
   class PooledHTable implements HTableInterface {
 
+private boolean open = false;
+
 private HTableInterface table; // actual table implementation
 
 public PooledHTable(HTableInterface table) {
   this.table = table;
+  this.open = true;
 }
 
 @Override
 public byte[] getTableName() {
+  checkState();
   return table.getTableName();
 }
 
 @Override
 public Configuration getConfiguration() {
+  checkState();
   return table.getConfiguration();
 }
 
 @Override
 public HTableDescriptor getTableDescriptor() throws IOException {
+  checkState();
   return table.getTableDescriptor();
 }
 
 @Override
 public boolean exists(Get get) throws IOException {
+  checkState();
   return table.exists(get);
 }
 
 @Override
 public Boolean[] exists(ListGet gets) throws IOException {
+  checkState();
   return table.exists(gets);
 }
 
 @Override
 public void batch(List? extends Row actions, Object[] results) throws 
IOException,
 InterruptedException {
+  checkState();
   table.batch(actions, results);
 }
 
 @Override
 public Object[] batch(List? extends Row actions) throws IOException,
 InterruptedException {
+  checkState();
   return table.batch(actions);
 }
 
 @Override
 public Result get(Get get) throws IOException {
+  checkState();
   return table.get(get);
 }
 
 @Override
 public Result[] get(ListGet gets) throws IOException {
+  checkState();
   return table.get(gets);
 }
 
 @Override
 @SuppressWarnings(deprecation)
 public Result getRowOrBefore(byte[] row, byte[] family) throws IOException 
{
+  checkState();
   return table.getRowOrBefore(row, family);
 }
 
 @Override
 public ResultScanner getScanner(Scan scan) throws IOException {
+  checkState();
   return table.getScanner(scan);
 }
 
 @Override
 public ResultScanner getScanner(byte[] family) throws IOException {
+  checkState();
   return table.getScanner(family);
 }
 
 @Override
 public ResultScanner getScanner(byte[] family, byte[] qualifier)
 throws IOException {
+  checkState();
   return table.getScanner(family, qualifier);
 }
 
 @Override
 public void put(Put put) throws IOException {
+  checkState();
   table.put(put);
 }
 
 @Override
 public void put(ListPut puts) throws IOException {
+  checkState();
   table.put(puts);
 }
 
 @Override
 public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
 byte[] value, Put put) throws IOException {
+  checkState();
   return table.checkAndPut(row, family, qualifier, value, put);
 }
 
 @Override
 public void delete(Delete delete) throws IOException {
+  checkState();
   table.delete(delete);
 }
 
 @Override
 public void delete(ListDelete deletes) throws IOException {
+  checkState();
   table.delete(deletes);
 }
 
 @Override
 public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
 byte[] value, Delete delete) throws IOException {
+  checkState();
   return table.checkAndDelete(row, family, qualifier, value, delete);
 }
 
 @Override
 public Result increment(Increment increment) throws IOException {
+  checkState();
   return table.increment(increment);
 }
 
 @Override
 public long incrementColumnValue(byte[] row, byte[] family,
 byte[] qualifier, long amount) throws IOException {
+  checkState();
   return table.incrementColumnValue(row, family, qualifier, amount);
 }
 
 @Override
 public long incrementColumnValue(byte[] row, byte[] family,
 byte[] qualifier, long amount, Durability durability) throws 
IOException {
+  checkState

svn commit: r1485402 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java

[stack]

Author: stack
Date: Wed May 22 20:21:27 2013
New Revision: 1485402

URL: http://svn.apache.org/r1485402
Log:
HBASE-8336 PooledHTable may be returned multiple times to the same pool

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java?rev=1485402r1=1485401r2=1485402view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
 Wed May 22 20:21:27 2013
@@ -324,138 +324,165 @@ public class HTablePool implements Close
*/
   class PooledHTable implements HTableInterface {
 
+private boolean open = false;
+
 private HTableInterface table; // actual table implementation
 
 public PooledHTable(HTableInterface table) {
   this.table = table;
+  this.open = true;
 }
 
 @Override
 public byte[] getTableName() {
+  checkState();
   return table.getTableName();
 }
 
 @Override
 public Configuration getConfiguration() {
+  checkState();
   return table.getConfiguration();
 }
 
 @Override
 public HTableDescriptor getTableDescriptor() throws IOException {
+  checkState();
   return table.getTableDescriptor();
 }
 
 @Override
 public boolean exists(Get get) throws IOException {
+  checkState();
   return table.exists(get);
 }
 
 @Override
 public Boolean[] exists(ListGet gets) throws IOException {
+  checkState();
   return table.exists(gets);
 }
 
 @Override
 public void batch(List? extends Row actions, Object[] results) throws 
IOException,
 InterruptedException {
+  checkState();
   table.batch(actions, results);
 }
 
 @Override
 public Object[] batch(List? extends Row actions) throws IOException,
 InterruptedException {
+  checkState();
   return table.batch(actions);
 }
 
 @Override
 public Result get(Get get) throws IOException {
+  checkState();
   return table.get(get);
 }
 
 @Override
 public Result[] get(ListGet gets) throws IOException {
+  checkState();
   return table.get(gets);
 }
 
 @Override
 @SuppressWarnings(deprecation)
 public Result getRowOrBefore(byte[] row, byte[] family) throws IOException 
{
+  checkState();
   return table.getRowOrBefore(row, family);
 }
 
 @Override
 public ResultScanner getScanner(Scan scan) throws IOException {
+  checkState();
   return table.getScanner(scan);
 }
 
 @Override
 public ResultScanner getScanner(byte[] family) throws IOException {
+  checkState();
   return table.getScanner(family);
 }
 
 @Override
 public ResultScanner getScanner(byte[] family, byte[] qualifier)
 throws IOException {
+  checkState();
   return table.getScanner(family, qualifier);
 }
 
 @Override
 public void put(Put put) throws IOException {
+  checkState();
   table.put(put);
 }
 
 @Override
 public void put(ListPut puts) throws IOException {
+  checkState();
   table.put(puts);
 }
 
 @Override
 public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
 byte[] value, Put put) throws IOException {
+  checkState();
   return table.checkAndPut(row, family, qualifier, value, put);
 }
 
 @Override
 public void delete(Delete delete) throws IOException {
+  checkState();
   table.delete(delete);
 }
 
 @Override
 public void delete(ListDelete deletes) throws IOException {
+  checkState();
   table.delete(deletes);
 }
 
 @Override
 public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
 byte[] value, Delete delete) throws IOException {
+  checkState();
   return table.checkAndDelete(row, family, qualifier, value, delete);
 }
 
 @Override
 public Result increment(Increment increment) throws IOException {
+  checkState();
   return table.increment(increment);
 }
 
 @Override
 public long incrementColumnValue(byte[] row, byte[] family,
 byte[] qualifier, long amount) throws IOException {
+  checkState();
   return table.incrementColumnValue(row, family, qualifier, amount);
 }
 
 @Override
 public long incrementColumnValue(byte[] row, byte[] family,
 byte[] qualifier, long amount, Durability durability) throws 
IOException {
+  checkState();
   return table.incrementColumnValue(row

svn commit: r1485867 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[stack]

Author: stack
Date: Thu May 23 22:02:38 2013
New Revision: 1485867

URL: http://svn.apache.org/r1485867
Log:
HBASE-8602 Ugly stack trace just because regionserver comes up before master

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1485867r1=1485866r2=1485867view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Thu May 23 22:02:38 2013
@@ -300,7 +300,7 @@ public class HRegionServer implements Cl
*/
   protected final MapString, InetSocketAddress[] regionFavoredNodesMap =
   new ConcurrentHashMapString, InetSocketAddress[]();
-   
+
   /**
* Set of regions currently being in recovering state which means it can 
accept writes(edits from
* previous failed region server) but not reads. A recovering region is also 
an online region.
@@ -472,7 +472,7 @@ public class HRegionServer implements Cl
 
   /** Handle all the snapshot requests to this server */
   RegionServerSnapshotManager snapshotManager;
-  
+
   // configuration setting on if replay WAL edits directly to another RS
   private final boolean distributedLogReplay;
 
@@ -567,7 +567,7 @@ public class HRegionServer implements Cl
 };
 this.rsHost = new RegionServerCoprocessorHost(this, this.conf);
 
-this.distributedLogReplay = 
this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, 
+this.distributedLogReplay = 
this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY,
   HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG);
   }
 
@@ -1903,6 +1903,8 @@ public class HRegionServer implements Cl
 LOG.fatal(Master rejected startup because clock is out of sync, ioe);
 // Re-throw IOE will cause RS to abort
 throw ioe;
+  } else if (ioe instanceof ServerNotRunningYetException) {
+LOG.debug(Master is not running yet);
   } else {
 LOG.warn(error telling master we are up, se);
   }
@@ -3773,7 +3775,7 @@ public class HRegionServer implements Cl
   @QosPriority(priority = HConstants.REPLAY_QOS)
   public MultiResponse replay(final RpcController rpcc, final MultiRequest 
request)
   throws ServiceException {
-long before = EnvironmentEdgeManager.currentTimeMillis();  
+long before = EnvironmentEdgeManager.currentTimeMillis();
 PayloadCarryingRpcController controller = (PayloadCarryingRpcController) 
rpcc;
 CellScanner cellScanner = controller != null ? controller.cellScanner() : 
null;
 // Clear scanner so we are not holding on to reference across call.
@@ -3807,7 +3809,7 @@ public class HRegionServer implements Cl
 } catch (IOException ie) {
   throw new ServiceException(ie);
 } finally {
-  
metricsRegionServer.updateReplay(EnvironmentEdgeManager.currentTimeMillis() - 
before); 
+  
metricsRegionServer.updateReplay(EnvironmentEdgeManager.currentTimeMillis() - 
before);
 }
   }
 
@@ -3945,7 +3947,7 @@ public class HRegionServer implements Cl
   final HRegion region, final ListMutationProto mutates, final 
CellScanner cells) {
 doBatchOp(builder, region, mutates, cells, false);
   }
-  
+
   /**
* Execute a list of Put/Delete mutations.
*
@@ -4255,7 +4257,7 @@ public class HRegionServer implements Cl
   // one level deeper for failed RS
   nodePath = ZKUtil.joinZNode(nodePath, previousRSName);
   ZKUtil.setData(zkw, nodePath, 
ZKUtil.positionToByteArray(minSeqIdForLogReplay));
-  LOG.debug(Update last flushed sequence id of region  + 
region.getEncodedName() +  for  
+  LOG.debug(Update last flushed sequence id of region  + 
region.getEncodedName() +  for 
   + previousRSName);
 } else {
   LOG.warn(Can't find failed region server for recovering region  + 
region.getEncodedName());

svn commit: r1485868 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[stack]

Author: stack
Date: Thu May 23 22:03:34 2013
New Revision: 1485868

URL: http://svn.apache.org/r1485868
Log:
HBASE-8602 Ugly stack trace just because regionserver comes up before master

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1485868r1=1485867r2=1485868view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Thu May 23 22:03:34 2013
@@ -300,7 +300,7 @@ public class HRegionServer implements Cl
*/
   protected final MapString, InetSocketAddress[] regionFavoredNodesMap =
   new ConcurrentHashMapString, InetSocketAddress[]();
-   
+
   /**
* Set of regions currently being in recovering state which means it can 
accept writes(edits from
* previous failed region server) but not reads. A recovering region is also 
an online region.
@@ -472,7 +472,7 @@ public class HRegionServer implements Cl
 
   /** Handle all the snapshot requests to this server */
   RegionServerSnapshotManager snapshotManager;
-  
+
   // configuration setting on if replay WAL edits directly to another RS
   private final boolean distributedLogReplay;
 
@@ -567,7 +567,7 @@ public class HRegionServer implements Cl
 };
 this.rsHost = new RegionServerCoprocessorHost(this, this.conf);
 
-this.distributedLogReplay = 
this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, 
+this.distributedLogReplay = 
this.conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY,
   HConstants.DEFAULT_DISTRIBUTED_LOG_REPLAY_CONFIG);
   }
 
@@ -1903,6 +1903,8 @@ public class HRegionServer implements Cl
 LOG.fatal(Master rejected startup because clock is out of sync, ioe);
 // Re-throw IOE will cause RS to abort
 throw ioe;
+  } else if (ioe instanceof ServerNotRunningYetException) {
+LOG.debug(Master is not running yet);
   } else {
 LOG.warn(error telling master we are up, se);
   }
@@ -3773,7 +3775,7 @@ public class HRegionServer implements Cl
   @QosPriority(priority = HConstants.REPLAY_QOS)
   public MultiResponse replay(final RpcController rpcc, final MultiRequest 
request)
   throws ServiceException {
-long before = EnvironmentEdgeManager.currentTimeMillis();  
+long before = EnvironmentEdgeManager.currentTimeMillis();
 PayloadCarryingRpcController controller = (PayloadCarryingRpcController) 
rpcc;
 CellScanner cellScanner = controller != null ? controller.cellScanner() : 
null;
 // Clear scanner so we are not holding on to reference across call.
@@ -3807,7 +3809,7 @@ public class HRegionServer implements Cl
 } catch (IOException ie) {
   throw new ServiceException(ie);
 } finally {
-  
metricsRegionServer.updateReplay(EnvironmentEdgeManager.currentTimeMillis() - 
before); 
+  
metricsRegionServer.updateReplay(EnvironmentEdgeManager.currentTimeMillis() - 
before);
 }
   }
 
@@ -3945,7 +3947,7 @@ public class HRegionServer implements Cl
   final HRegion region, final ListMutationProto mutates, final 
CellScanner cells) {
 doBatchOp(builder, region, mutates, cells, false);
   }
-  
+
   /**
* Execute a list of Put/Delete mutations.
*
@@ -4255,7 +4257,7 @@ public class HRegionServer implements Cl
   // one level deeper for failed RS
   nodePath = ZKUtil.joinZNode(nodePath, previousRSName);
   ZKUtil.setData(zkw, nodePath, 
ZKUtil.positionToByteArray(minSeqIdForLogReplay));
-  LOG.debug(Update last flushed sequence id of region  + 
region.getEncodedName() +  for  
+  LOG.debug(Update last flushed sequence id of region  + 
region.getEncodedName() +  for 
   + previousRSName);
 } else {
   LOG.warn(Can't find failed region server for recovering region  + 
region.getEncodedName());

svn commit: r1485873 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

[stack]

Author: stack
Date: Thu May 23 22:18:04 2013
New Revision: 1485873

URL: http://svn.apache.org/r1485873
Log:
HBASE-2231 Compaction events should be written to HLog; LOGGING ADDENDUM

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java?rev=1485873r1=1485872r2=1485873view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
 Thu May 23 22:18:04 2013
@@ -39,7 +39,8 @@ import org.apache.hadoop.hbase.ServerNam
 import 
org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.FSUtils;
-import org.apache.hadoop.hbase.util.Bytes;
+
+import com.google.protobuf.TextFormat;
 
 public class HLogUtil {
   static final Log LOG = LogFactory.getLog(HLogUtil.class);
@@ -262,6 +263,8 @@ public class HLogUtil {
 WALEdit e = WALEdit.createCompaction(c);
 log.append(info, c.getTableName().toByteArray(), e,
 EnvironmentEdgeManager.currentTimeMillis(), htd);
-LOG.info(Appended compaction marker  + c);
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Appended compaction marker  + 
TextFormat.shortDebugString(c));
+}
   }
 }

svn commit: r1485874 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

[stack]

Author: stack
Date: Thu May 23 22:18:33 2013
New Revision: 1485874

URL: http://svn.apache.org/r1485874
Log:
HBASE-2231 Compaction events should be written to HLog; LOGGING ADDENDUM

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java?rev=1485874r1=1485873r2=1485874view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java
 Thu May 23 22:18:33 2013
@@ -39,7 +39,8 @@ import org.apache.hadoop.hbase.ServerNam
 import 
org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.FSUtils;
-import org.apache.hadoop.hbase.util.Bytes;
+
+import com.google.protobuf.TextFormat;
 
 public class HLogUtil {
   static final Log LOG = LogFactory.getLog(HLogUtil.class);
@@ -262,6 +263,8 @@ public class HLogUtil {
 WALEdit e = WALEdit.createCompaction(c);
 log.append(info, c.getTableName().toByteArray(), e,
 EnvironmentEdgeManager.currentTimeMillis(), htd);
-LOG.info(Appended compaction marker  + c);
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Appended compaction marker  + 
TextFormat.shortDebugString(c));
+}
   }
 }

svn commit: r1485886 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

[stack]

Author: stack
Date: Thu May 23 22:31:01 2013
New Revision: 1485886

URL: http://svn.apache.org/r1485886
Log:
HBASE-8600 Bunch of log lines from QosFunction: Marking normal priority after

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java?rev=1485886r1=1485885r2=1485886view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
 Thu May 23 22:31:01 2013
@@ -166,7 +166,7 @@ class QosFunction implements FunctionPa
 } catch (Exception ex) {
   // Not good throwing an exception out of here, a runtime anyways.  Let 
the query go into the
   // server and have it throw the exception if still an issue.  Just mark 
it normal priority.
-  if (LOG.isDebugEnabled()) LOG.debug(Marking normal priority after 
getting exception= + ex);
+  if (LOG.isTraceEnabled()) LOG.trace(Marking normal priority after 
getting exception= + ex);
   return HConstants.NORMAL_QOS;
 }
 

svn commit: r1485887 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

[stack]

Author: stack
Date: Thu May 23 22:31:14 2013
New Revision: 1485887

URL: http://svn.apache.org/r1485887
Log:
HBASE-8600 Bunch of log lines from QosFunction: Marking normal priority after

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java?rev=1485887r1=1485886r2=1485887view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java
 Thu May 23 22:31:14 2013
@@ -166,7 +166,7 @@ class QosFunction implements FunctionPa
 } catch (Exception ex) {
   // Not good throwing an exception out of here, a runtime anyways.  Let 
the query go into the
   // server and have it throw the exception if still an issue.  Just mark 
it normal priority.
-  if (LOG.isDebugEnabled()) LOG.debug(Marking normal priority after 
getting exception= + ex);
+  if (LOG.isTraceEnabled()) LOG.trace(Marking normal priority after 
getting exception= + ex);
   return HConstants.NORMAL_QOS;
 }
 

svn commit: r1485903 - in /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase: io/hfile/ master/ regionserver/ regionserver/wal/ util/

[stack]

Author: stack
Date: Fri May 24 00:12:50 2013
New Revision: 1485903

URL: http://svn.apache.org/r1485903
Log:
HBASE-8608 Do an edit of logs.. we log too much.

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java?rev=1485903r1=1485902r2=1485903view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
 Fri May 24 00:12:50 2013
@@ -34,7 +34,6 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.KeyComparator;
-import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.hadoop.hbase.io.compress.Compression;
 import org.apache.hadoop.hbase.io.hfile.HFile.Writer;
 import org.apache.hadoop.hbase.io.hfile.HFileBlock.BlockWritable;
@@ -143,7 +142,7 @@ public class HFileWriterV2 extends Abstr
 
 // Meta data block index writer
 metaBlockIndexWriter = new HFileBlockIndex.BlockIndexWriter();
-LOG.debug(Initialized with  + cacheConf);
+if (LOG.isTraceEnabled()) LOG.trace(Initialized with  + cacheConf);
   }
 
   /**

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java?rev=1485903r1=1485902r2=1485903view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableLockManager.java
 Fri May 24 00:12:50 2013
@@ -239,7 +239,7 @@ public abstract class TableLockManager {
 if (data == null) {
   return;
 }
-LOG.debug(Table is locked by:  +
+LOG.debug(Table is locked by  +
 String.format([tableName=%s, lockOwner=%s, threadId=%s,  +
 purpose=%s, isShared=%s, createTime=%s], 
Bytes.toString(data.getTableName().toByteArray()),
 ProtobufUtil.toServerName(data.getLockOwner()), 
data.getThreadId(),
@@ -270,9 +270,9 @@ public abstract class TableLockManager {
 
   @Override
   public void acquire() throws IOException {
-if (LOG.isDebugEnabled()) {
-  LOG.debug(Attempt to acquire table  + (isShared ? read : write)
-  +  lock on : + tableNameStr +  for: + purpose);
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Attempt to acquire table  + (isShared ? read : 
write) +
+ lock on:  + tableNameStr +  for: + purpose);
 }
 
 lock = createTableLock();
@@ -292,15 +292,15 @@ public abstract class TableLockManager {
   Thread.currentThread().interrupt();
   throw new InterruptedIOException(Interrupted acquiring a lock);
 }
-LOG.debug(Acquired table  + (isShared ? read : write)
-+  lock on : + tableNameStr +  for: + purpose);
+if (LOG.isTraceEnabled()) LOG.trace(Acquired table  + (isShared ? 
read : write)
++  lock on  + tableNameStr +  for  + purpose);
   }
 
   @Override
   public void release() throws IOException {
-if (LOG.isDebugEnabled()) {
-  LOG.debug(Attempt to release table  + (isShared ? read : write)
-  +  lock on : + tableNameStr);
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Attempt to release table  + (isShared ? read : write)
+  +  lock on  + tableNameStr);
 }
 if (lock == null

svn commit: r1485929 - /hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

[stack]

Author: stack
Date: Fri May 24 03:34:35 2013
New Revision: 1485929

URL: http://svn.apache.org/r1485929
Log:
HBASE-8606 Meta scanner is not closed

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java?rev=1485929r1=1485928r2=1485929view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
 Fri May 24 03:34:35 2013
@@ -127,6 +127,7 @@ public class MetaScanner {
 HTable metaTable = new HTable(configuration, HConstants.META_TABLE_NAME);
 // Calculate startrow for scan.
 byte[] startRow;
+ResultScanner scanner = null;
 try {
   if (row != null) {
 // Scan starting at a particular row in a particular table
@@ -160,7 +161,7 @@ public class MetaScanner {
   Bytes.toStringBinary(startRow) +  for max= + rowUpperLimit +  
with caching= + rows);
   }
   // Run the scan
-  ResultScanner scanner = metaTable.getScanner(scan);
+  scanner = metaTable.getScanner(scan);
   Result result = null;
   int processedRows = 0;
   while ((result = scanner.next()) != null) {
@@ -171,8 +172,27 @@ public class MetaScanner {
 if (processedRows = rowUpperLimit) break;
   }
 } finally {
-  if (visitor != null) visitor.close();
-  if (metaTable != null) metaTable.close();
+  if (scanner != null) {
+try {
+  scanner.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the result scanner, t);
+}
+  }
+  if (visitor != null) {
+try {
+  visitor.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the meta scanner visitor, t);
+}
+  }
+  if (metaTable != null) {
+try {
+  metaTable.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the meta table, t);
+}
+  }
 }
   }
 

svn commit: r1485930 - /hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

[stack]

Author: stack
Date: Fri May 24 03:35:09 2013
New Revision: 1485930

URL: http://svn.apache.org/r1485930
Log:
HBASE-8606 Meta scanner is not closed

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java?rev=1485930r1=1485929r2=1485930view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java
 Fri May 24 03:35:09 2013
@@ -127,6 +127,7 @@ public class MetaScanner {
 HTable metaTable = new HTable(configuration, HConstants.META_TABLE_NAME);
 // Calculate startrow for scan.
 byte[] startRow;
+ResultScanner scanner = null;
 try {
   if (row != null) {
 // Scan starting at a particular row in a particular table
@@ -160,7 +161,7 @@ public class MetaScanner {
   Bytes.toStringBinary(startRow) +  for max= + rowUpperLimit +  
with caching= + rows);
   }
   // Run the scan
-  ResultScanner scanner = metaTable.getScanner(scan);
+  scanner = metaTable.getScanner(scan);
   Result result = null;
   int processedRows = 0;
   while ((result = scanner.next()) != null) {
@@ -171,8 +172,27 @@ public class MetaScanner {
 if (processedRows = rowUpperLimit) break;
   }
 } finally {
-  if (visitor != null) visitor.close();
-  if (metaTable != null) metaTable.close();
+  if (scanner != null) {
+try {
+  scanner.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the result scanner, t);
+}
+  }
+  if (visitor != null) {
+try {
+  visitor.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the meta scanner visitor, t);
+}
+  }
+  if (metaTable != null) {
+try {
+  metaTable.close();
+} catch (Throwable t) {
+  LOG.debug(Got exception in closing the meta table, t);
+}
+  }
 }
   }
 

svn commit: r1486104 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

[stack]

Author: stack
Date: Fri May 24 16:17:24 2013
New Revision: 1486104

URL: http://svn.apache.org/r1486104
Log:
HBASE-8570 CompactSplitThread logs a CompactSplitThread but it does not have a 
toString

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1486104r1=1486103r2=1486104view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 Fri May 24 16:17:24 2013
@@ -364,6 +364,11 @@ public class CompactSplitThread implemen
   this.region = region;
   this.compaction = compaction;
 }
+
+@Override
+public String toString() {
+  return Request =  + compaction.getRequest();
+}
 
 @Override
 public void run() {

svn commit: r1486105 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

[stack]

Author: stack
Date: Fri May 24 16:17:43 2013
New Revision: 1486105

URL: http://svn.apache.org/r1486105
Log:
HBASE-8570 CompactSplitThread logs a CompactSplitThread but it does not have a 
toString

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1486105r1=1486104r2=1486105view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 Fri May 24 16:17:43 2013
@@ -364,6 +364,11 @@ public class CompactSplitThread implemen
   this.region = region;
   this.compaction = compaction;
 }
+
+@Override
+public String toString() {
+  return Request =  + compaction.getRequest();
+}
 
 @Override
 public void run() {

svn commit: r1486108 - in /hbase/trunk: hbase-common/src/main/resources/hbase-default.xml hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java

[stack]

Author: stack
Date: Fri May 24 16:20:16 2013
New Revision: 1486108

URL: http://svn.apache.org/r1486108
Log:
HBASE-8449 Refactor recoverLease retries and pauses informed by findings over 
in hbase-8389

Modified:
hbase/trunk/hbase-common/src/main/resources/hbase-default.xml

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java

Modified: hbase/trunk/hbase-common/src/main/resources/hbase-default.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/resources/hbase-default.xml?rev=1486108r1=1486107r2=1486108view=diff
==
--- hbase/trunk/hbase-common/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/hbase-common/src/main/resources/hbase-default.xml Fri May 24 
16:20:16 2013
@@ -1028,4 +1028,21 @@ possible configurations would overwhelm 
 hbase.server.compactchecker.interval.multiplier multiplied by 
hbase.server.thread.wakefrequency.
 /description
   /property
+  property
+namehbase.lease.recovery.timeout/name
+value90/value
+description
+  How long we wait on dfs lease recovery in total before giving up.
+/description
+  /property
+  property
+namehbase.lease.recovery.dfs.timeout/name
+value61000/value
+description
+How long between dfs recover lease invocations. Should be just larger 
than how long
+it takes the namenode to timeout trying to reach a datanode; usually
+dfs.socket.timeout.  If HBase asked hdfs its cluster configs, we would 
not need
+this config.  See the end of HBASE-8389 for more.
+/description
+  /property
 /configuration

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java?rev=1486108r1=1486107r2=1486108view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
 Fri May 24 16:20:16 2013
@@ -31,6 +31,7 @@ import org.apache.hadoop.hdfs.server.nam
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.lang.reflect.Method;
 
 
 /**
@@ -46,61 +47,162 @@ public class FSHDFSUtils extends FSUtils
*/
   @Override
   public void recoverFileLease(final FileSystem fs, final Path p,
-  Configuration conf, CancelableProgressable reporter) throws IOException {
+  Configuration conf, CancelableProgressable reporter)
+  throws IOException {
 // lease recovery not needed for local file system case.
-if (!(fs instanceof DistributedFileSystem)) {
-  return;
-}
-DistributedFileSystem dfs = (DistributedFileSystem) fs;
+if (!(fs instanceof DistributedFileSystem)) return;
+recoverDFSFileLease((DistributedFileSystem)fs, p, conf, reporter);
+  }
 
-LOG.info(Recovering file  + p);
+  /*
+   * Run the dfs recover lease. recoverLease is asynchronous. It returns:
+   *-false when it starts the lease recovery (i.e. lease recovery not 
*yet* done)
+   *- true when the lease recovery has succeeded or the file is closed.
+   * But, we have to be careful.  Each time we call recoverLease, it starts 
the recover lease
+   * process over from the beginning.  We could put ourselves in a situation 
where we are
+   * doing nothing but starting a recovery, interrupting it to start again, 
and so on.
+   * The findings over in HBASE-8354 have it that the namenode will try to 
recover the lease
+   * on the file's primary node.  If all is well, it should return near 
immediately.  But,
+   * as is common, it is the very primary node that has crashed and so the 
namenode will be
+   * stuck waiting on a socket timeout before it will ask another datanode to 
start the
+   * recovery. It does not help if we call recoverLease in the meantime and in 
particular,
+   * subsequent to the socket timeout, a recoverLease invocation will cause us 
to start
+   * over from square one (possibly waiting on socket timeout against primary 
node).  So,
+   * in the below, we do the following:
+   * 1. Call recoverLease.
+   * 2. If it returns true, break.
+   * 3. If it returns false, wait a few seconds and then call it again.
+   * 4. If it returns true, break.
+   * 5. If it returns false, wait for what we think the datanode socket 
timeout is
+   * (configurable) and then try again.
+   * 6. If it returns true, break.
+   * 7. If it returns false, repeat starting at step 5. above.
+   * 
+   * If HDFS-4525 is available, call it every second and we might be able to 
exit early.
+   */
+  boolean recoverDFSFileLease(final DistributedFileSystem dfs, final Path p,
+  final Configuration conf, final CancelableProgressable

svn commit: r1486118 - in /hbase/trunk: hbase-it/src/test/java/org/apache/hadoop/hbase/test/ hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-server/src/main/java/org/apache/hadoop/hbase/

[stack]

Author: stack
Date: Fri May 24 17:02:53 2013
New Revision: 1486118

URL: http://svn.apache.org/r1486118
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey

Modified:

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1486118r1=1486117r2=1486118view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 Fri May 24 17:02:53 2013
@@ -170,6 +170,8 @@ public class IntegrationTestBigLinkedLis
   private static final String GENERATOR_NUM_MAPPERS_KEY
 = IntegrationTestBigLinkedList.generator.map.tasks;
 
+  protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster
+
   static class CINode {
 long key;
 long prev;
@@ -648,7 +650,7 @@ public class IntegrationTestBigLinkedLis
* Executes Generate and Verify in a loop. Data is not cleaned between runs, 
so each iteration
* adds more data.
*/
-  private static class Loop extends Configured implements Tool {
+  static class Loop extends Configured implements Tool {
 
 private static final Log LOG = LogFactory.getLog(Loop.class);
 
@@ -916,12 +918,12 @@ public class IntegrationTestBigLinkedLis
 return node;
   }
 
-  private IntegrationTestingUtility util;
+  protected IntegrationTestingUtility util;
 
   @Before
   public void setUp() throws Exception {
 util = getTestingUtil();
-util.initializeCluster(3);
+util.initializeCluster(this.NUM_SLAVES_BASE);
 this.setConf(util.getConfiguration());
   }
 
@@ -939,7 +941,7 @@ public class IntegrationTestBigLinkedLis
 org.junit.Assert.assertEquals(0, ret);
   }
 
-  private IntegrationTestingUtility getTestingUtil() {
+  protected IntegrationTestingUtility getTestingUtil() {
 if (this.util == null) {
   if (getConf() == null) {
 this.util = new IntegrationTestingUtility();

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java?rev=1486118r1=1486117r2=1486118view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
 Fri May 24 17:02:53 2013
@@ -290,12 +290,27 @@ public class RpcServer implements RpcSer
 
 @Override
 public String toString() {
-  String serviceName = this.connection.service != null?
-this.connection.service.getDescriptorForType().getName(): null;
-  return callId:  + this.id +  service:  + serviceName +  methodName: 
 +
-((this.md != null)? this.md.getName(): null) +  param:  +
-(this.param != null? IPCUtil.getRequestShortTextFormat(this.param): 
) +
- connection:  + connection.toString();
+  return toShortString() +  param: 
+  + (this.param != null ? 
IPCUtil.getRequestShortTextFormat(this.param) : );
+}
+
+/*
+ * Short string representation without param info because param itself 
could be huge depends on
+ * the payload of a command
+ */
+String toShortString() {
+  String serviceName = this.connection.service != null ? 
this.connection.service
+  .getDescriptorForType().getName() : null;
+  StringBuilder sb = new StringBuilder();
+  sb.append(callId: );
+  sb.append(this.id);
+  sb.append( service: );
+  sb.append(serviceName);
+  sb.append( methodName: );
+  sb.append((this.md != null) ? this.md.getName() : );
+  sb.append( connection: );
+  sb.append(connection.toString());
+  return sb.toString();
 }
 
 protected synchronized void setSaslTokenResponse(ByteBuffer response) {
@@ -986,7 +1001,8 @@ public class RpcServer implements RpcSer
 }
   } finally {
 if (error  call != null) {
-  LOG.warn(getName() + call.toString() + : output error);
+  LOG.warn(getName() + ((call.size  512) ? call.toShortString() : 
call.toString())
+  + : output error);
   done = true;   // error. no more data for this channel.
   closeConnection(call.connection);
 }

Modified: 
hbase/trunk/hbase-server/src/main/java/org

svn commit: r1486120 - in /hbase/trunk: hbase-it/src/test/java/org/apache/hadoop/hbase/test/ hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-server/src/main/java/org/apache/hadoop/hbase/

[stack]

Author: stack
Date: Fri May 24 17:06:00 2013
New Revision: 1486120

URL: http://svn.apache.org/r1486120
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey; REVERTED

Modified:

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1486120r1=1486119r2=1486120view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 Fri May 24 17:06:00 2013
@@ -170,8 +170,6 @@ public class IntegrationTestBigLinkedLis
   private static final String GENERATOR_NUM_MAPPERS_KEY
 = IntegrationTestBigLinkedList.generator.map.tasks;
 
-  protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster
-
   static class CINode {
 long key;
 long prev;
@@ -650,7 +648,7 @@ public class IntegrationTestBigLinkedLis
* Executes Generate and Verify in a loop. Data is not cleaned between runs, 
so each iteration
* adds more data.
*/
-  static class Loop extends Configured implements Tool {
+  private static class Loop extends Configured implements Tool {
 
 private static final Log LOG = LogFactory.getLog(Loop.class);
 
@@ -918,12 +916,12 @@ public class IntegrationTestBigLinkedLis
 return node;
   }
 
-  protected IntegrationTestingUtility util;
+  private IntegrationTestingUtility util;
 
   @Before
   public void setUp() throws Exception {
 util = getTestingUtil();
-util.initializeCluster(this.NUM_SLAVES_BASE);
+util.initializeCluster(3);
 this.setConf(util.getConfiguration());
   }
 
@@ -941,7 +939,7 @@ public class IntegrationTestBigLinkedLis
 org.junit.Assert.assertEquals(0, ret);
   }
 
-  protected IntegrationTestingUtility getTestingUtil() {
+  private IntegrationTestingUtility getTestingUtil() {
 if (this.util == null) {
   if (getConf() == null) {
 this.util = new IntegrationTestingUtility();

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java?rev=1486120r1=1486119r2=1486120view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
 Fri May 24 17:06:00 2013
@@ -290,27 +290,12 @@ public class RpcServer implements RpcSer
 
 @Override
 public String toString() {
-  return toShortString() +  param: 
-  + (this.param != null ? 
IPCUtil.getRequestShortTextFormat(this.param) : );
-}
-
-/*
- * Short string representation without param info because param itself 
could be huge depends on
- * the payload of a command
- */
-String toShortString() {
-  String serviceName = this.connection.service != null ? 
this.connection.service
-  .getDescriptorForType().getName() : null;
-  StringBuilder sb = new StringBuilder();
-  sb.append(callId: );
-  sb.append(this.id);
-  sb.append( service: );
-  sb.append(serviceName);
-  sb.append( methodName: );
-  sb.append((this.md != null) ? this.md.getName() : );
-  sb.append( connection: );
-  sb.append(connection.toString());
-  return sb.toString();
+  String serviceName = this.connection.service != null?
+this.connection.service.getDescriptorForType().getName(): null;
+  return callId:  + this.id +  service:  + serviceName +  methodName: 
 +
+((this.md != null)? this.md.getName(): null) +  param:  +
+(this.param != null? IPCUtil.getRequestShortTextFormat(this.param): 
) +
+ connection:  + connection.toString();
 }
 
 protected synchronized void setSaslTokenResponse(ByteBuffer response) {
@@ -1001,8 +986,7 @@ public class RpcServer implements RpcSer
 }
   } finally {
 if (error  call != null) {
-  LOG.warn(getName() + ((call.size  512) ? call.toShortString() : 
call.toString())
-  + : output error);
+  LOG.warn(getName() + call.toString() + : output error);
   done = true;   // error. no more data for this channel.
   closeConnection(call.connection);
 }

Modified: 
hbase/trunk/hbase-server/src/main

svn commit: r1486121 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java

[stack]

Author: stack
Date: Fri May 24 17:06:26 2013
New Revision: 1486121

URL: http://svn.apache.org/r1486121
Log:
HBASE-8449 Refactor recoverLease retries and pauses informed by findings over 
in hbase-8389

Added:

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java

Added: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java?rev=1486121view=auto
==
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
 (added)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java
 Fri May 24 17:06:26 2013
@@ -0,0 +1,109 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hbase.util;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.Mockito;
+
+/**
+ * Test our recoverLease loop against mocked up filesystem.
+ */
+@Category(MediumTests.class)
+public class TestFSHDFSUtils {
+  private static final HBaseTestingUtility HTU = new HBaseTestingUtility();
+  static {
+Configuration conf = HTU.getConfiguration();
+conf.setInt(hbase.lease.recovery.dfs.timeout, 1000);
+conf.setInt(hbase.lease.recovery.first.pause, 10);
+conf.setInt(hbase.lease.recovery.pause, 10);
+  };
+  private FSHDFSUtils fsHDFSUtils = new FSHDFSUtils();
+  private static Path FILE = new Path(HTU.getDataTestDir(), file.txt);
+  long startTime = -1;
+
+  @Before
+  public void setup() {
+this.startTime = EnvironmentEdgeManager.currentTimeMillis();
+  }
+
+  /**
+   * Test recover lease eventually succeeding.
+   * @throws IOException 
+   */
+  @Test (timeout = 3)
+  public void testRecoverLease() throws IOException {
+CancelableProgressable reporter = 
Mockito.mock(CancelableProgressable.class);
+Mockito.when(reporter.progress()).thenReturn(true);
+DistributedFileSystem dfs = Mockito.mock(DistributedFileSystem.class);
+// Fail four times and pass on the fifth.
+Mockito.when(dfs.recoverLease(FILE)).
+  
thenReturn(false).thenReturn(false).thenReturn(false).thenReturn(false).thenReturn(true);
+assertTrue(this.fsHDFSUtils.recoverDFSFileLease(dfs, FILE, 
HTU.getConfiguration(), reporter));
+Mockito.verify(dfs, Mockito.times(5)).recoverLease(FILE);
+// Make sure we waited at least hbase.lease.recovery.dfs.timeout * 3 (the 
first two
+// invocations will happen pretty fast... the we fall into the longer wait 
loop).
+assertTrue((EnvironmentEdgeManager.currentTimeMillis() - this.startTime) 
+  (3 * HTU.getConfiguration().getInt(hbase.lease.recovery.dfs.timeout, 
61000)));
+  }
+
+  /**
+   * Test that isFileClosed makes us recover lease faster.
+   * @throws IOException
+   */
+  @Test (timeout = 3)
+  public void testIsFileClosed() throws IOException {
+// Make this time long so it is plain we broke out because of the 
isFileClosed invocation.
+HTU.getConfiguration().setInt(hbase.lease.recovery.dfs.timeout, 10);
+CancelableProgressable reporter = 
Mockito.mock(CancelableProgressable.class);
+Mockito.when(reporter.progress()).thenReturn(true);
+IsFileClosedDistributedFileSystem dfs = 
Mockito.mock(IsFileClosedDistributedFileSystem.class);
+// Now make it so we fail the first two times -- the two fast invocations, 
then we fall into
+// the long loop during which we will call isFileClosed the next 
invocation should
+// therefore return true if we are to break the loop.
+Mockito.when(dfs.recoverLease(FILE)).
+  thenReturn(false).thenReturn(false).thenReturn(true);
+Mockito.when(dfs.isFileClosed(FILE.toString())).thenReturn(true

svn commit: r1486230 - /hbase/trunk/src/main/docbkx/getting_started.xml

[stack]

Author: stack
Date: Fri May 24 21:55:22 2013
New Revision: 1486230

URL: http://svn.apache.org/r1486230
Log:
Add link to blog on hbase and ubuntu 127.0.1.1

Modified:
hbase/trunk/src/main/docbkx/getting_started.xml

Modified: hbase/trunk/src/main/docbkx/getting_started.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/getting_started.xml?rev=1486230r1=1486229r2=1486230view=diff
==
Binary files - no diff available.

svn commit: r1486232 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-server/src/main/java/org/apache/hadoo

[stack]

Author: stack
Date: Fri May 24 22:05:35 2013
New Revision: 1486232

URL: http://svn.apache.org/r1486232
Log:
HBASE-8366 HBaseServer logs the full query

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java?rev=1486232r1=1486231r2=1486232view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java 
(original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java 
Fri May 24 22:05:35 2013
@@ -28,17 +28,14 @@ import java.nio.ByteBuffer;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.io.ByteBufferOutputStream;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
 import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest;
-import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse;
 import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest;
-import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.compress.CodecPool;
 import org.apache.hadoop.io.compress.CompressionCodec;
@@ -270,24 +267,4 @@ class IPCUtil {
 Preconditions.checkArgument(totalSize  Integer.MAX_VALUE);
 return totalSize;
   }
-
-  /**
-   * Return short version of Param Message toString'd, shorter than 
TextFormat#regionServerStartup
-   * @param methodName
-   * @param request
-   * @return toString of passed codeparam/code
-   */
-  static String getRequestShortTextFormat(Message request) {
-if (request instanceof ScanRequest) {
-  return TextFormat.shortDebugString(request);
-} else if (request instanceof RegionServerReportRequest) {
-  // Print a short message only, just the servername and the requests, not 
the full load.
-  RegionServerReportRequest r = (RegionServerReportRequest)request;
-  return server  + TextFormat.shortDebugString(r.getServer()) +
- load { numberOfRequests:  + r.getLoad().getNumberOfRequests() +  
};
-} else if (request instanceof RegionServerStartupRequest) {
-  return TextFormat.shortDebugString(request);
-}
-return TODO  + TextFormat.shortDebugString(request);
-  }
 }
\ No newline at end of file

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java?rev=1486232r1=1486231r2=1486232view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
 Fri May 24 22:05:35 2013
@@ -57,6 +57,7 @@ import org.apache.hadoop.hbase.HConstant
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.codec.KeyValueCodec;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos;
 import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta;
 import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader;
@@ -272,7 +273,7 @@ public class RpcClient {
 @Override
 public String toString() {
   return callId:  + this.id +  methodName:  + this.md.getName() +  
param { +
-(this.param != null? TextFormat.shortDebugString(this.param): ) + 
};
+(this.param != null? ProtobufUtil.getShortTextFormat(this.param): ) 
+ };
 }
 
 /** Indicate when the call is complete and the

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
URL: 
http://svn.apache.org/viewvc/hbase

svn commit: r1486233 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-server/src/main/java/org/apac

[stack]

Author: stack
Date: Fri May 24 22:05:56 2013
New Revision: 1486233

URL: http://svn.apache.org/r1486233
Log:
HBASE-8366 HBaseServer logs the full query

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/QosFunction.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java?rev=1486233r1=1486232r2=1486233view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java
 Fri May 24 22:05:56 2013
@@ -28,17 +28,14 @@ import java.nio.ByteBuffer;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.io.ByteBufferOutputStream;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
 import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest;
-import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportResponse;
 import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupRequest;
-import 
org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.compress.CodecPool;
 import org.apache.hadoop.io.compress.CompressionCodec;
@@ -270,24 +267,4 @@ class IPCUtil {
 Preconditions.checkArgument(totalSize  Integer.MAX_VALUE);
 return totalSize;
   }
-
-  /**
-   * Return short version of Param Message toString'd, shorter than 
TextFormat#regionServerStartup
-   * @param methodName
-   * @param request
-   * @return toString of passed codeparam/code
-   */
-  static String getRequestShortTextFormat(Message request) {
-if (request instanceof ScanRequest) {
-  return TextFormat.shortDebugString(request);
-} else if (request instanceof RegionServerReportRequest) {
-  // Print a short message only, just the servername and the requests, not 
the full load.
-  RegionServerReportRequest r = (RegionServerReportRequest)request;
-  return server  + TextFormat.shortDebugString(r.getServer()) +
- load { numberOfRequests:  + r.getLoad().getNumberOfRequests() +  
};
-} else if (request instanceof RegionServerStartupRequest) {
-  return TextFormat.shortDebugString(request);
-}
-return TODO  + TextFormat.shortDebugString(request);
-  }
 }
\ No newline at end of file

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java?rev=1486233r1=1486232r2=1486233view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClient.java
 Fri May 24 22:05:56 2013
@@ -57,6 +57,7 @@ import org.apache.hadoop.hbase.HConstant
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.codec.KeyValueCodec;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos;
 import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta;
 import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader;
@@ -272,7 +273,7 @@ public class RpcClient {
 @Override
 public String toString() {
   return callId:  + this.id +  methodName:  + this.md.getName() +  
param { +
-(this.param != null? TextFormat.shortDebugString(this.param): ) + 
};
+(this.param != null? ProtobufUtil.getShortTextFormat(this.param): ) 
+ };
 }
 
 /** Indicate when the call is complete and the

Modified: 
hbase/branches/0.95/hbase

svn commit: r1486255 - in /hbase/trunk: hbase-it/src/test/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/hbase/test/ hbase-server/src/main/java/org/apache/hadoop/hbase/regionse

[stack]

Author: stack
Date: Sat May 25 00:09:52 2013
New Revision: 1486255

URL: http://svn.apache.org/r1486255
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey

Modified:

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java?rev=1486255r1=1486254r2=1486255view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
 Sat May 25 00:09:52 2013
@@ -116,7 +116,7 @@ public class IntegrationTestingUtility e
* cluster or a local cluster.
* @see IntegrationTestingUtility#setUseDistributedCluster(Configuration)
*/
-  private boolean isDistributedCluster() {
+  public boolean isDistributedCluster() {
 Configuration conf = getConfiguration();
 boolean isDistributedCluster = false;
 isDistributedCluster = 
Boolean.parseBoolean(System.getProperty(IS_DISTRIBUTED_CLUSTER, false));

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1486255r1=1486254r2=1486255view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 Sat May 25 00:09:52 2013
@@ -148,9 +148,9 @@ import org.junit.experimental.categories
 @Category(IntegrationTests.class)
 public class IntegrationTestBigLinkedList extends Configured implements Tool {
 
-  private static final String TABLE_NAME_KEY = 
IntegrationTestBigLinkedList.table;
+  protected static String TABLE_NAME_KEY = 
IntegrationTestBigLinkedList.table;
 
-  private static final String DEFAULT_TABLE_NAME = 
IntegrationTestBigLinkedList;
+  protected static String DEFAULT_TABLE_NAME = IntegrationTestBigLinkedList;
 
   private static byte[] FAMILY_NAME = Bytes.toBytes(meta);
 
@@ -170,6 +170,8 @@ public class IntegrationTestBigLinkedLis
   private static final String GENERATOR_NUM_MAPPERS_KEY
 = IntegrationTestBigLinkedList.generator.map.tasks;
 
+  protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster
+
   static class CINode {
 long key;
 long prev;
@@ -648,7 +650,7 @@ public class IntegrationTestBigLinkedLis
* Executes Generate and Verify in a loop. Data is not cleaned between runs, 
so each iteration
* adds more data.
*/
-  private static class Loop extends Configured implements Tool {
+  static class Loop extends Configured implements Tool {
 
 private static final Log LOG = LogFactory.getLog(Loop.class);
 
@@ -916,12 +918,12 @@ public class IntegrationTestBigLinkedLis
 return node;
   }
 
-  private IntegrationTestingUtility util;
+  protected IntegrationTestingUtility util;
 
   @Before
   public void setUp() throws Exception {
 util = getTestingUtil();
-util.initializeCluster(3);
+util.initializeCluster(this.NUM_SLAVES_BASE);
 this.setConf(util.getConfiguration());
   }
 
@@ -939,7 +941,7 @@ public class IntegrationTestBigLinkedLis
 org.junit.Assert.assertEquals(0, ret);
   }
 
-  private IntegrationTestingUtility getTestingUtil() {
+  protected IntegrationTestingUtility getTestingUtil() {
 if (this.util == null) {
   if (getConf() == null) {
 this.util = new IntegrationTestingUtility();

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1486255r1=1486254r2=1486255view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Sat May 25 00:09:52 2013
@@ -930,7 +930,7 @@ public class HRegionServer implements Cl
 }
 
 //fsOk flag may be changed when closing regions throws exception.
-if (!this.killed  this.fsOk) {
+if (this.fsOk) {
   closeWAL(!abortRequested);
 }
 

svn commit: r1486256 - in /hbase/branches/0.95: hbase-it/src/test/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/hbase/test/ hbase-server/src/main/java/org/apache/hadoop/hbase/

[stack]

Author: stack
Date: Sat May 25 00:10:21 2013
New Revision: 1486256

URL: http://svn.apache.org/r1486256
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey

Modified:

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java?rev=1486256r1=1486255r2=1486256view=diff
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
 (original)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
 Sat May 25 00:10:21 2013
@@ -116,7 +116,7 @@ public class IntegrationTestingUtility e
* cluster or a local cluster.
* @see IntegrationTestingUtility#setUseDistributedCluster(Configuration)
*/
-  private boolean isDistributedCluster() {
+  public boolean isDistributedCluster() {
 Configuration conf = getConfiguration();
 boolean isDistributedCluster = false;
 isDistributedCluster = 
Boolean.parseBoolean(System.getProperty(IS_DISTRIBUTED_CLUSTER, false));

Modified: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1486256r1=1486255r2=1486256view=diff
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 (original)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
 Sat May 25 00:10:21 2013
@@ -148,9 +148,9 @@ import org.junit.experimental.categories
 @Category(IntegrationTests.class)
 public class IntegrationTestBigLinkedList extends Configured implements Tool {
 
-  private static final String TABLE_NAME_KEY = 
IntegrationTestBigLinkedList.table;
+  protected static String TABLE_NAME_KEY = 
IntegrationTestBigLinkedList.table;
 
-  private static final String DEFAULT_TABLE_NAME = 
IntegrationTestBigLinkedList;
+  protected static String DEFAULT_TABLE_NAME = IntegrationTestBigLinkedList;
 
   private static byte[] FAMILY_NAME = Bytes.toBytes(meta);
 
@@ -170,6 +170,8 @@ public class IntegrationTestBigLinkedLis
   private static final String GENERATOR_NUM_MAPPERS_KEY
 = IntegrationTestBigLinkedList.generator.map.tasks;
 
+  protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster
+
   static class CINode {
 long key;
 long prev;
@@ -648,7 +650,7 @@ public class IntegrationTestBigLinkedLis
* Executes Generate and Verify in a loop. Data is not cleaned between runs, 
so each iteration
* adds more data.
*/
-  private static class Loop extends Configured implements Tool {
+  static class Loop extends Configured implements Tool {
 
 private static final Log LOG = LogFactory.getLog(Loop.class);
 
@@ -916,12 +918,12 @@ public class IntegrationTestBigLinkedLis
 return node;
   }
 
-  private IntegrationTestingUtility util;
+  protected IntegrationTestingUtility util;
 
   @Before
   public void setUp() throws Exception {
 util = getTestingUtil();
-util.initializeCluster(3);
+util.initializeCluster(this.NUM_SLAVES_BASE);
 this.setConf(util.getConfiguration());
   }
 
@@ -939,7 +941,7 @@ public class IntegrationTestBigLinkedLis
 org.junit.Assert.assertEquals(0, ret);
   }
 
-  private IntegrationTestingUtility getTestingUtil() {
+  protected IntegrationTestingUtility getTestingUtil() {
 if (this.util == null) {
   if (getConf() == null) {
 this.util = new IntegrationTestingUtility();

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1486256r1=1486255r2=1486256view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Sat May 25 00:10:21 2013
@@ -930,7 +930,7 @@ public class HRegionServer implements Cl
 }
 
 //fsOk flag may be changed when closing regions throws exception

svn commit: r1486289 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[stack]

Author: stack
Date: Sat May 25 04:41:28 2013
New Revision: 1486289

URL: http://svn.apache.org/r1486289
Log:
HBASE-8613 Improve logging when BindException is received at startup time

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1486289r1=1486288r2=1486289view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Sat May 25 04:41:28 2013
@@ -1595,6 +1595,7 @@ public class HRegionServer implements Cl
   } catch (BindException e) {
 if (!auto) {
   // auto bind disabled throw BindException
+  LOG.error(Failed binding http info server to port:  + port);
   throw e;
 }
 // auto bind enabled, try to use another port

svn commit: r1486290 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[stack]

Author: stack
Date: Sat May 25 04:41:53 2013
New Revision: 1486290

URL: http://svn.apache.org/r1486290
Log:
HBASE-8613 Improve logging when BindException is received at startup time

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1486290r1=1486289r2=1486290view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Sat May 25 04:41:53 2013
@@ -1595,6 +1595,7 @@ public class HRegionServer implements Cl
   } catch (BindException e) {
 if (!auto) {
   // auto bind disabled throw BindException
+  LOG.error(Failed binding http info server to port:  + port);
   throw e;
 }
 // auto bind enabled, try to use another port

svn commit: r1486291 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ hbase-server/src/main/java/org/apache/hado

[stack]

Author: stack
Date: Sat May 25 06:05:07 2013
New Revision: 1486291

URL: http://svn.apache.org/r1486291
Log:
HBASE-8621 More log edits; we log too much

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1486291r1=1486290r2=1486291view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Sat May 25 06:05:07 2013
@@ -204,7 +204,8 @@ public class ClientScanner extends Abstr
 localStartKey = this.scan.getStartRow();
   }
 
-  if (LOG.isDebugEnabled()) {
+  if (LOG.isDebugEnabled()  this.currentRegion != null) {
+// Only worth logging if NOT first region in scan.
 LOG.debug(Advancing internal scanner to startKey at ' +
   Bytes.toStringBinary(localStartKey) + ');
   }

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1486291r1=1486290r2=1486291view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
 Sat May 25 06:05:07 2013
@@ -265,8 +265,8 @@ public class CatalogJanitor extends Chor
 LOG.info(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
 +  unreferenced merged region(s) and  + splitCleaned
 +  unreferenced parent region(s));
-  } else if (LOG.isDebugEnabled()) {
-LOG.debug(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
+  } else if (LOG.isTraceEnabled()) {
+LOG.trace(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
 +  unreferenced merged region(s) and  + splitCleaned
 +  unreferenced parent region(s));
   }

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java?rev=1486291r1=1486290r2=1486291view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
 Sat May 25 06:05:07 2013
@@ -378,11 +378,14 @@ public abstract class BaseLoadBalancer i
 int ceiling = (int) Math.ceil(average * (1 + slop));
 if (!(cs.getMinLoad()  ceiling || cs.getMaxLoad()  floor)) {
   NavigableMapServerAndLoad, ListHRegionInfo serversByLoad = 
cs.getServersByLoad();
-  LOG.info(Skipping load balancing because balanced cluster;  +
+  if (LOG.isTraceEnabled()) {
+// If nothing to balance, then don't say anything unless trace-level 
logging.
+LOG.trace(Skipping load balancing because balanced cluster;  +
   servers= + cs.getNumServers() +   +
   regions= + cs.getNumRegions() +  average= + average +   +
   mostloaded= + serversByLoad.lastKey().getLoad() +
leastloaded= + serversByLoad.firstKey().getLoad());
+  }
   return false;
 }
 return true;

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java?rev=1486291r1=1486290r2=1486291view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org

svn commit: r1486292 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ hbase-server/src/main/java/org/apa

[stack]

Author: stack
Date: Sat May 25 06:05:22 2013
New Revision: 1486292

URL: http://svn.apache.org/r1486292
Log:
HBASE-8621 More log edits; we log too much

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileInfo.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/lock/ZKInterProcessLockBase.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1486292r1=1486291r2=1486292view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Sat May 25 06:05:22 2013
@@ -204,7 +204,8 @@ public class ClientScanner extends Abstr
 localStartKey = this.scan.getStartRow();
   }
 
-  if (LOG.isDebugEnabled()) {
+  if (LOG.isDebugEnabled()  this.currentRegion != null) {
+// Only worth logging if NOT first region in scan.
 LOG.debug(Advancing internal scanner to startKey at ' +
   Bytes.toStringBinary(localStartKey) + ');
   }

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java?rev=1486292r1=1486291r2=1486292view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
 Sat May 25 06:05:22 2013
@@ -265,8 +265,8 @@ public class CatalogJanitor extends Chor
 LOG.info(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
 +  unreferenced merged region(s) and  + splitCleaned
 +  unreferenced parent region(s));
-  } else if (LOG.isDebugEnabled()) {
-LOG.debug(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
+  } else if (LOG.isTraceEnabled()) {
+LOG.trace(Scanned  + count +  catalog row(s), gc'd  + mergeCleaned
 +  unreferenced merged region(s) and  + splitCleaned
 +  unreferenced parent region(s));
   }

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java?rev=1486292r1=1486291r2=1486292view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
 Sat May 25 06:05:22 2013
@@ -378,11 +378,14 @@ public abstract class BaseLoadBalancer i
 int ceiling = (int) Math.ceil(average * (1 + slop));
 if (!(cs.getMinLoad()  ceiling || cs.getMaxLoad()  floor)) {
   NavigableMapServerAndLoad, ListHRegionInfo serversByLoad = 
cs.getServersByLoad();
-  LOG.info(Skipping load balancing because balanced cluster;  +
+  if (LOG.isTraceEnabled()) {
+// If nothing to balance, then don't say anything unless trace-level 
logging.
+LOG.trace(Skipping load balancing because balanced cluster;  +
   servers= + cs.getNumServers() +   +
   regions= + cs.getNumRegions() +  average= + average +   +
   mostloaded= + serversByLoad.lastKey().getLoad() +
leastloaded= + serversByLoad.firstKey().getLoad());
+  }
   return false;
 }
 return true;

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler

svn commit: r1486346 - in /hbase/trunk/hbase-server/src/main: jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

[stack]

Author: stack
Date: Sat May 25 17:18:27 2013
New Revision: 1486346

URL: http://svn.apache.org/r1486346
Log:
HBASE-8622 Remove ' You are currently running the HMaster without HDFS append 
support enabled. This may result in data loss. Please see the HBase wiki for 
details. ' from UI

Modified:

hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

Modified: 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1486346r1=1486345r2=1486346view=diff
==
--- 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
 (original)
+++ 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
 Sat May 25 17:18:27 2013
@@ -23,7 +23,6 @@ MapString, Integer frags = null;
 ServerName metaLocation = null;
 ListServerName servers = null;
 SetServerName deadServers = null;
-boolean showAppendWarning = false;
 boolean catalogJanitorEnabled = true;
 String filter = general;
 String format = html;
@@ -108,14 +107,6 @@ org.apache.hadoop.hbase.protobuf.generat
   for details.
   /div
 /%if
-%if showAppendWarning %
-  div class=alert alert-error
-  You are currently running the HMaster without HDFS append support 
enabled.
-  This may result in data loss.
-  Please see the a 
href=http://wiki.apache.org/hadoop/Hbase/HdfsSyncSupport;HBase wiki/a
-  for details.
-  /div
-/%if
 %if master.isInitialized()  !catalogJanitorEnabled %
   div class=alert alert-error
   Please note that your cluster is running with the CatalogJanitor 
disabled. It can be

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java?rev=1486346r1=1486345r2=1486346view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 Sat May 25 17:18:27 2013
@@ -54,12 +54,12 @@ public class MasterStatusServlet extends
   {
 HMaster master = (HMaster) 
getServletContext().getAttribute(HMaster.MASTER);
 assert master != null : No Master in context!;
-
+
 Configuration conf = master.getConfiguration();
-HBaseAdmin admin = new HBaseAdmin(conf);
-
+HBaseAdmin admin = new HBaseAdmin(conf);
+
 MapString, Integer frags = getFragmentationInfo(master, conf);
-
+
 ServerName metaLocation = getMetaLocationOrNull(master);
 //ServerName metaLocation = master.getCatalogTracker().getMetaLocation();
 ListServerName servers = 
master.getServerManager().getOnlineServersList();
@@ -70,7 +70,6 @@ public class MasterStatusServlet extends
 try {
tmpl = new MasterStatusTmpl()
   .setFrags(frags)
-  .setShowAppendWarning(shouldShowAppendWarning(conf))
   .setMetaLocation(metaLocation)
   .setServers(servers)
   .setDeadServers(deadServers)
@@ -99,20 +98,11 @@ public class MasterStatusServlet extends
   private MapString, Integer getFragmentationInfo(
   HMaster master, Configuration conf) throws IOException {
 boolean showFragmentation = conf.getBoolean(
-hbase.master.ui.fragmentation.enabled, false);
+hbase.master.ui.fragmentation.enabled, false);
 if (showFragmentation) {
   return FSUtils.getTableFragmentation(master);
 } else {
   return null;
 }
   }
-
-  static boolean shouldShowAppendWarning(Configuration conf) {
-try {
-  return !FSUtils.isAppendSupported(conf)  FSUtils.isHDFS(conf);
-} catch (IOException e) {
-  LOG.warn(Unable to determine if append is supported, e);
-  return false;
-}
-  }
 }

svn commit: r1486347 - in /hbase/branches/0.95/hbase-server/src/main: jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

[stack]

Author: stack
Date: Sat May 25 17:18:51 2013
New Revision: 1486347

URL: http://svn.apache.org/r1486347
Log:
HBASE-8622 Remove ' You are currently running the HMaster without HDFS append 
support enabled. This may result in data loss. Please see the HBase wiki for 
details. ' from UI

Modified:

hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1486347r1=1486346r2=1486347view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
 Sat May 25 17:18:51 2013
@@ -23,7 +23,6 @@ MapString, Integer frags = null;
 ServerName metaLocation = null;
 ListServerName servers = null;
 SetServerName deadServers = null;
-boolean showAppendWarning = false;
 boolean catalogJanitorEnabled = true;
 String filter = general;
 String format = html;
@@ -108,14 +107,6 @@ org.apache.hadoop.hbase.protobuf.generat
   for details.
   /div
 /%if
-%if showAppendWarning %
-  div class=alert alert-error
-  You are currently running the HMaster without HDFS append support 
enabled.
-  This may result in data loss.
-  Please see the a 
href=http://wiki.apache.org/hadoop/Hbase/HdfsSyncSupport;HBase wiki/a
-  for details.
-  /div
-/%if
 %if master.isInitialized()  !catalogJanitorEnabled %
   div class=alert alert-error
   Please note that your cluster is running with the CatalogJanitor 
disabled. It can be

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java?rev=1486347r1=1486346r2=1486347view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
 Sat May 25 17:18:51 2013
@@ -54,12 +54,12 @@ public class MasterStatusServlet extends
   {
 HMaster master = (HMaster) 
getServletContext().getAttribute(HMaster.MASTER);
 assert master != null : No Master in context!;
-
+
 Configuration conf = master.getConfiguration();
-HBaseAdmin admin = new HBaseAdmin(conf);
-
+HBaseAdmin admin = new HBaseAdmin(conf);
+
 MapString, Integer frags = getFragmentationInfo(master, conf);
-
+
 ServerName metaLocation = getMetaLocationOrNull(master);
 //ServerName metaLocation = master.getCatalogTracker().getMetaLocation();
 ListServerName servers = 
master.getServerManager().getOnlineServersList();
@@ -70,7 +70,6 @@ public class MasterStatusServlet extends
 try {
tmpl = new MasterStatusTmpl()
   .setFrags(frags)
-  .setShowAppendWarning(shouldShowAppendWarning(conf))
   .setMetaLocation(metaLocation)
   .setServers(servers)
   .setDeadServers(deadServers)
@@ -99,20 +98,11 @@ public class MasterStatusServlet extends
   private MapString, Integer getFragmentationInfo(
   HMaster master, Configuration conf) throws IOException {
 boolean showFragmentation = conf.getBoolean(
-hbase.master.ui.fragmentation.enabled, false);
+hbase.master.ui.fragmentation.enabled, false);
 if (showFragmentation) {
   return FSUtils.getTableFragmentation(master);
 } else {
   return null;
 }
   }
-
-  static boolean shouldShowAppendWarning(Configuration conf) {
-try {
-  return !FSUtils.isAppendSupported(conf)  FSUtils.isHDFS(conf);
-} catch (IOException e) {
-  LOG.warn(Unable to determine if append is supported, e);
-  return false;
-}
-  }
 }

svn commit: r1486358 - /hbase/trunk/src/main/docbkx/configuration.xml

[stack]

Author: stack
Date: Sat May 25 20:30:43 2013
New Revision: 1486358

URL: http://svn.apache.org/r1486358
Log:
Add section on mttr; cite nicolas/devaraj blog and point at hbase-8389 varun 
comments

Modified:
hbase/trunk/src/main/docbkx/configuration.xml

Modified: hbase/trunk/src/main/docbkx/configuration.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/configuration.xml?rev=1486358r1=1486357r2=1486358view=diff
==
Binary files - no diff available.

svn commit: r1486359 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java

[stack]

Author: stack
Date: Sat May 25 20:31:44 2013
New Revision: 1486359

URL: http://svn.apache.org/r1486359
Log:
HBASE-8618 Master is providing dead RegionServer ServerName's to the balancer

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java?rev=1486359r1=1486358r2=1486359view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
 Sat May 25 20:31:44 2013
@@ -343,7 +343,7 @@ public class RegionStates {
 // Clean up this server from map of servers to regions, and remove all 
regions
 // of this server from online map of regions.
 ListHRegionInfo rits = new ArrayListHRegionInfo();
-SetHRegionInfo assignedRegions = serverHoldings.get(sn);
+SetHRegionInfo assignedRegions = serverHoldings.remove(sn);
 if (assignedRegions == null) {
   assignedRegions = new HashSetHRegionInfo();
 }

svn commit: r1486360 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java

[stack]

Author: stack
Date: Sat May 25 20:32:16 2013
New Revision: 1486360

URL: http://svn.apache.org/r1486360
Log:
HBASE-8618 Master is providing dead RegionServer ServerName's to the balancer

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java?rev=1486360r1=1486359r2=1486360view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
 Sat May 25 20:32:16 2013
@@ -343,7 +343,7 @@ public class RegionStates {
 // Clean up this server from map of servers to regions, and remove all 
regions
 // of this server from online map of regions.
 ListHRegionInfo rits = new ArrayListHRegionInfo();
-SetHRegionInfo assignedRegions = serverHoldings.get(sn);
+SetHRegionInfo assignedRegions = serverHoldings.remove(sn);
 if (assignedRegions == null) {
   assignedRegions = new HashSetHRegionInfo();
 }

svn commit: r1486376 - /hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

[stack]

Author: stack
Date: Sat May 25 22:10:56 2013
New Revision: 1486376

URL: http://svn.apache.org/r1486376
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey -- FORGOT 
TO SVN ADD A FILE

Added:

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

Added: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java?rev=1486376view=auto
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 (added)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 Sat May 25 22:10:56 2013
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hbase.test;
+
+import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.IntegrationTestingUtility;
+import org.apache.hadoop.hbase.IntegrationTests;
+import org.apache.hadoop.hbase.util.ChaosMonkey;
+import org.apache.hadoop.util.ToolRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+/**
+ * This is the same integration test as {@link IntegrationTestBigLinkedList} 
while killing the
+ * region servers and the master(s) randomly
+ */
+@Category(IntegrationTests.class)
+public class IntegrationTestBigLinkedListWithChaosMonkey extends 
IntegrationTestBigLinkedList {
+  private static final Log LOG = LogFactory
+  .getLog(IntegrationTestBigLinkedListWithChaosMonkey.class);
+
+  private ChaosMonkey monkey;
+
+  public IntegrationTestBigLinkedListWithChaosMonkey() {
+super();
+TABLE_NAME_KEY = IntegrationTestBigLinkedListWithChaosMonkey.table;
+DEFAULT_TABLE_NAME = IntegrationTestBigLinkedListWithChaosMonkey;
+  }
+
+  @Before
+  public void setUp() throws Exception {
+if (!getTestingUtil().isDistributedCluster()) {
+  this.NUM_SLAVES_BASE = 5; // only used in MiniCluster mode
+}
+super.setUp();
+monkey = new ChaosMonkey(util, 
ChaosMonkey.EVERY_MINUTE_RANDOM_ACTION_POLICY);
+LOG.info(Chaos Monkey Starting);
+monkey.start();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+if (monkey != null) {
+  monkey.stop(test has finished, that's why);
+  monkey.waitForStop();
+}
+super.tearDown();
+  }
+
+  @Test
+  public void testContinuousIngest() throws IOException, Exception {
+// Loop num iterations num mappers num nodes per mapper output dir 
num reducers
+int ret = ToolRunner.run(
+  getTestingUtil().getConfiguration(),
+  new Loop(),
+  new String[] { 1, 1, 100,
+  
util.getDataTestDirOnTestFS(IntegrationTestBigLinkedListWithChaosMonkey).toString(),
+  1 });
+org.junit.Assert.assertEquals(0, ret);
+  }
+
+  public static void main(String[] args) throws Exception {
+
+IntegrationTestBigLinkedListWithChaosMonkey test = 
+new IntegrationTestBigLinkedListWithChaosMonkey();
+
IntegrationTestingUtility.setUseDistributedCluster(test.getTestingUtil().getConfiguration());
+// set minimum cluster size requirements
+test.NUM_SLAVES_BASE = 3;
+test.setUp();
+
+// run the test
+int ret = ToolRunner.run(test.getConf(), test, args);
+
+test.tearDown();
+System.exit(ret);
+  }
+}

svn commit: r1486378 - /hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

[stack]

Author: stack
Date: Sat May 25 22:11:15 2013
New Revision: 1486378

URL: http://svn.apache.org/r1486378
Log:
HBASE-8583 Create a new IntegrationTestBigLinkedListWithChaosMonkey -- FORGOT 
TO SVN ADD A FILE

Added:

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

Added: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java?rev=1486378view=auto
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 (added)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 Sat May 25 22:11:15 2013
@@ -0,0 +1,98 @@
+/**
+ * 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.
+ */
+
+package org.apache.hadoop.hbase.test;
+
+import java.io.IOException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.IntegrationTestingUtility;
+import org.apache.hadoop.hbase.IntegrationTests;
+import org.apache.hadoop.hbase.util.ChaosMonkey;
+import org.apache.hadoop.util.ToolRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+/**
+ * This is the same integration test as {@link IntegrationTestBigLinkedList} 
while killing the
+ * region servers and the master(s) randomly
+ */
+@Category(IntegrationTests.class)
+public class IntegrationTestBigLinkedListWithChaosMonkey extends 
IntegrationTestBigLinkedList {
+  private static final Log LOG = LogFactory
+  .getLog(IntegrationTestBigLinkedListWithChaosMonkey.class);
+
+  private ChaosMonkey monkey;
+
+  public IntegrationTestBigLinkedListWithChaosMonkey() {
+super();
+TABLE_NAME_KEY = IntegrationTestBigLinkedListWithChaosMonkey.table;
+DEFAULT_TABLE_NAME = IntegrationTestBigLinkedListWithChaosMonkey;
+  }
+
+  @Before
+  public void setUp() throws Exception {
+if (!getTestingUtil().isDistributedCluster()) {
+  this.NUM_SLAVES_BASE = 5; // only used in MiniCluster mode
+}
+super.setUp();
+monkey = new ChaosMonkey(util, 
ChaosMonkey.EVERY_MINUTE_RANDOM_ACTION_POLICY);
+LOG.info(Chaos Monkey Starting);
+monkey.start();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+if (monkey != null) {
+  monkey.stop(test has finished, that's why);
+  monkey.waitForStop();
+}
+super.tearDown();
+  }
+
+  @Test
+  public void testContinuousIngest() throws IOException, Exception {
+// Loop num iterations num mappers num nodes per mapper output dir 
num reducers
+int ret = ToolRunner.run(
+  getTestingUtil().getConfiguration(),
+  new Loop(),
+  new String[] { 1, 1, 100,
+  
util.getDataTestDirOnTestFS(IntegrationTestBigLinkedListWithChaosMonkey).toString(),
+  1 });
+org.junit.Assert.assertEquals(0, ret);
+  }
+
+  public static void main(String[] args) throws Exception {
+
+IntegrationTestBigLinkedListWithChaosMonkey test = 
+new IntegrationTestBigLinkedListWithChaosMonkey();
+
IntegrationTestingUtility.setUseDistributedCluster(test.getTestingUtil().getConfiguration());
+// set minimum cluster size requirements
+test.NUM_SLAVES_BASE = 3;
+test.setUp();
+
+// run the test
+int ret = ToolRunner.run(test.getConf(), test, args);
+
+test.tearDown();
+System.exit(ret);
+  }
+}

svn commit: r1486697 - /hbase/tags/0.95.1RC0/

[stack]

Author: stack
Date: Mon May 27 19:10:47 2013
New Revision: 1486697

URL: http://svn.apache.org/r1486697
Log:
Tagging 0.95.1RC0

Added:
hbase/tags/0.95.1RC0/   (props changed)
  - copied from r1486696, hbase/branches/0.95/

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:ignore (added)
+++ svn:ignore Mon May 27 19:10:47 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 27 19:10:47 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1486696 - in /hbase/branches/0.95: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-hadoop2-compat/ hbase-it/ hbase-prefix-t

[stack]

Author: stack
Date: Mon May 27 19:09:58 2013
New Revision: 1486696

URL: http://svn.apache.org/r1486696
Log:
Prep for releases

Modified:
hbase/branches/0.95/CHANGES.txt
hbase/branches/0.95/hbase-assembly/pom.xml
hbase/branches/0.95/hbase-client/pom.xml
hbase/branches/0.95/hbase-common/pom.xml
hbase/branches/0.95/hbase-examples/pom.xml
hbase/branches/0.95/hbase-hadoop-compat/pom.xml
hbase/branches/0.95/hbase-hadoop1-compat/pom.xml
hbase/branches/0.95/hbase-hadoop2-compat/pom.xml
hbase/branches/0.95/hbase-it/pom.xml
hbase/branches/0.95/hbase-prefix-tree/pom.xml
hbase/branches/0.95/hbase-protocol/pom.xml
hbase/branches/0.95/hbase-server/pom.xml
hbase/branches/0.95/pom.xml

Modified: hbase/branches/0.95/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/CHANGES.txt?rev=1486696r1=1486695r2=1486696view=diff
==
--- hbase/branches/0.95/CHANGES.txt (original)
+++ hbase/branches/0.95/CHANGES.txt Mon May 27 19:09:58 2013
@@ -1,5 +1,243 @@
 HBase Change Log
 
+Release 0.95.1 -- Release Candidate, May 27th, 2013 
+215 issues resolved.  See
+https://issues.apache.org/jira/issues/?jql=project%20%3D%20HBASE%20AND%20fixVersion%20%3D%20%220.95.1%22%20AND%20status%20%3D%20Resolved%20ORDER%20BY%20type%20DESC
+
+Test
+
+HBASE-8071 - TestRestoreFlushSnapshotFromClient fails intermittently in trunk 
builds
+HBASE-8520 - TestIOFencing fails intermittently due to compaction kicking in 
too soon
+HBASE-8535 - Test for zk leak does not account for unsynchronized access to zk 
watcher
+HBASE-8333 - TestTableLockManager#testDelete may occasionally fail due to lack 
of synchronization between test and handler thread
+HBASE-8308 - Lower the number of expected regions in 
TestTableLockManager#testTableReadLock
+HBASE-8575 - TestDistributedLogSplitting#testMarkRegionsRecoveringInZK fails 
intermittently due to lack of online region
+
+Task
+
+HBASE-7936 - Undo prefix-tree module as dependency for mapreduce and for 
DataBlockEncoding
+HBASE-8045 - Fix .META. migration after HBASE-3171
+HBASE-7897 - Add support for tags to Cell Interface
+HBASE-7997 - One last set of class moves before 0.95 goes out
+HBASE-7704 - migration tool that checks presence of HFile V1 files
+HBASE-8450 - Update hbase-default.xml and general recommendations to better 
suit current hw, h2, experience, etc.
+HBASE-8395 - Remove TestFromClientSide.testPoolBehavior
+HBASE-8319 - hbase-it tests are run when you ask to run all tests -- it should 
be that you have to ask explicitly to run them
+HBASE-8296 - Add svn ignores to hbase-assembly
+HBASE-8574 - Add how to rename a table in the docbook
+HBASE-6365 - Deprecate classes that depend on (old) metrics framework
+
+Sub-task
+
+HBASE-7995 - HBASE-8084 Export$Exporter could be replaced with 
IdentityTableMapper
+HBASE-7942 - HBASE-4755 Make use of the plumbing in HBASE-7932 to provide 
location hints when region files are created
+HBASE-7932 - HBASE-4755 Do the necessary plumbing for the region locations in 
META table and send the info to the RegionServers
+HBASE-7836 - HBASE-7006 Create a new replay command so that recovered 
edits won't mess up normal coprocessing  metrics
+HBASE-7835 - HBASE-7006 Implementation of the log splitting without creating 
intermediate files
+HBASE-7837 - HBASE-7006 Add new metrics to better monitor recovery process
+HBASE-7636 - HBASE-6891 TestDistributedLogSplitting#testThreeRSAbort fails 
against hadoop 2.0
+HBASE-7606 - HBASE-6891 TestJoinedScanners fails in trunk build on hadoop 2.0
+HBASE-7605 - HBASE-6891 TestMiniClusterLoadSequential fails in trunk build on 
hadoop 2
+HBASE-7413 - HBASE-5305 Convert WAL to pb
+HBASE-7239 - HBASE-7215 Verify protobuf serialization is correctly chunking 
upon read to avoid direct memory OOMs
+HBASE-8024 - HBASE-7949 Make Store flush algorithm pluggable
+HBASE-8477 - HBASE-6891 [hadoop2] TestTableInputFormatScan* fails 
intermittently with PrivilegedActionException
+HBASE-8478 - HBASE-6891 HBASE-2231 breaks 
TestHRegion#testRecoveredEditsReplayCompaction under hadoop2 profile
+HBASE-8469 - HBASE-6891 [hadoop2] Several tests break because of HDFS-4305
+HBASE-8424 - HBASE-8427 IntegrationTestImportTsv missing Apache License
+HBASE-8429 - HBASE-8427 TestMetricsWALSourceImpl from hbase-hadoop2-compat 
module missing Apache license.
+HBASE-8392 - HBASE-6891 TestMetricMBeanBase#testGetAttribute is flakey under 
hadoop2 profile
+HBASE-8497 - HBASE-5305 Protobuf WAL also needs a trailer
+HBASE-8528 - HBASE-6891 [hadoop2] TestMultiTableInputFormat always fails on 
hadoop with YARN-129 applied
+HBASE-8347 - HBASE-6891 TestSecureLoadInc* tests hang repeatedly getting 
UnsupportedOperationException in hadoop2 profile
+HBASE-8349 - HBASE-6891 TestLogRolling#TestLogRollOnDatanodeDeath hangs under 
hadoop2 profile
+HBASE-8343 - HBASE-6891 TestMultiTableInputFormat hung in 
HBase-TRUNK-on-Hadoop-2.0.0 build #498
+HBASE-8342

svn commit: r1486704 - /hbase/tags/0.95.1RC0/

[stack]

Author: stack
Date: Mon May 27 20:09:42 2013
New Revision: 1486704

URL: http://svn.apache.org/r1486704
Log:
Delete tag made prematurely

Removed:
hbase/tags/0.95.1RC0/

svn commit: r1486703 - /hbase/branches/0.95/src/main/docbkx/

[stack]

Author: stack
Date: Mon May 27 20:09:03 2013
New Revision: 1486703

URL: http://svn.apache.org/r1486703
Log:
Update doc in 0.95

Added:
hbase/branches/0.95/src/main/docbkx/cp.xml   (with props)
Modified:
hbase/branches/0.95/src/main/docbkx/book.xml
hbase/branches/0.95/src/main/docbkx/case_studies.xml
hbase/branches/0.95/src/main/docbkx/community.xml
hbase/branches/0.95/src/main/docbkx/configuration.xml
hbase/branches/0.95/src/main/docbkx/developer.xml
hbase/branches/0.95/src/main/docbkx/external_apis.xml
hbase/branches/0.95/src/main/docbkx/getting_started.xml
hbase/branches/0.95/src/main/docbkx/ops_mgt.xml
hbase/branches/0.95/src/main/docbkx/performance.xml
hbase/branches/0.95/src/main/docbkx/preface.xml
hbase/branches/0.95/src/main/docbkx/rpc.xml
hbase/branches/0.95/src/main/docbkx/schema_design.xml
hbase/branches/0.95/src/main/docbkx/security.xml
hbase/branches/0.95/src/main/docbkx/shell.xml
hbase/branches/0.95/src/main/docbkx/troubleshooting.xml
hbase/branches/0.95/src/main/docbkx/upgrading.xml
hbase/branches/0.95/src/main/docbkx/zookeeper.xml

Modified: hbase/branches/0.95/src/main/docbkx/book.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/book.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/case_studies.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/case_studies.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/community.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/community.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/configuration.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/configuration.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Added: hbase/branches/0.95/src/main/docbkx/cp.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/cp.xml?rev=1486703view=auto
==
Binary file - no diff available.

Propchange: hbase/branches/0.95/src/main/docbkx/cp.xml
--
svn:mime-type = application/xml

Modified: hbase/branches/0.95/src/main/docbkx/developer.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/developer.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/external_apis.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/external_apis.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/getting_started.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/getting_started.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/ops_mgt.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/ops_mgt.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/performance.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/performance.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/preface.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/preface.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/rpc.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/src/main/docbkx/rpc.xml?rev=1486703r1=1486702r2=1486703view=diff
==
Binary files - no diff available.

Modified: hbase/branches/0.95/src/main/docbkx/schema_design.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95

svn commit: r1486705 - /hbase/tags/0.95.1RC0/

[stack]

Author: stack
Date: Mon May 27 20:09:58 2013
New Revision: 1486705

URL: http://svn.apache.org/r1486705
Log:
Tagging 0.95.1RC0 -- for second time

Added:
hbase/tags/0.95.1RC0/   (props changed)
  - copied from r1486704, hbase/branches/0.95/

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:ignore (added)
+++ svn:ignore Mon May 27 20:09:58 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 27 20:09:58 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1486707 - /hbase/tags/0.95.1RC0/

[stack]

Author: stack
Date: Mon May 27 20:10:22 2013
New Revision: 1486707

URL: http://svn.apache.org/r1486707
Log:
Delete tag made prematurely ... again

Removed:
hbase/tags/0.95.1RC0/

svn commit: r1486710 - /hbase/tags/0.95.1RC0/

[stack]

Author: stack
Date: Mon May 27 20:34:44 2013
New Revision: 1486710

URL: http://svn.apache.org/r1486710
Log:
Tagging 0.95.1RC0 -- for third time

Added:
hbase/tags/0.95.1RC0/   (props changed)
  - copied from r1486709, hbase/branches/0.95/

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:ignore (added)
+++ svn:ignore Mon May 27 20:34:44 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1RC0/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 27 20:34:44 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1486709 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java

[stack]

Author: stack
Date: Mon May 27 20:34:33 2013
New Revision: 1486709

URL: http://svn.apache.org/r1486709
Log:
Fix javadoc warning

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java?rev=1486709r1=1486708r2=1486709view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
 Mon May 27 20:34:33 2013
@@ -101,7 +101,7 @@ import static org.apache.hadoop.hbase.pr
  *
  * p
  * To perform authorization checks, {@code AccessController} relies on the
- * {@link org.apache.hadoop.hbase.ipc.RpcServerEngine} being loaded to provide
+ * RpcServer being loaded to provide
  * the user identities for remote requests.
  * /p
  *
@@ -453,10 +453,10 @@ public class AccessController extends Ba
 if (env instanceof MasterCoprocessorEnvironment) {
   // if running on HMaster
   MasterCoprocessorEnvironment mEnv = (MasterCoprocessorEnvironment) env;
-  zk = mEnv.getMasterServices().getZooKeeper();  
-} else if (env instanceof RegionServerCoprocessorEnvironment) {  
+  zk = mEnv.getMasterServices().getZooKeeper();
+} else if (env instanceof RegionServerCoprocessorEnvironment) {
   RegionServerCoprocessorEnvironment rsEnv = 
(RegionServerCoprocessorEnvironment) env;
-  zk = rsEnv.getRegionServerServices().getZooKeeper();  
+  zk = rsEnv.getRegionServerServices().getZooKeeper();
 } else if (env instanceof RegionCoprocessorEnvironment) {
   // if running at region
   regionEnv = (RegionCoprocessorEnvironment) env;
@@ -822,7 +822,7 @@ public class AccessController extends Ba
   public void preSplit(ObserverContextRegionCoprocessorEnvironment e) throws 
IOException {
 requirePermission(split, getTableName(e.getEnvironment()), null, null, 
Action.ADMIN);
   }
-  
+
   @Override
   public void preSplit(ObserverContextRegionCoprocessorEnvironment e,
   byte[] splitRow) throws IOException {

svn commit: r1486716 - /hbase/trunk/src/main/docbkx/developer.xml

[stack]

Author: stack
Date: Mon May 27 21:30:57 2013
New Revision: 1486716

URL: http://svn.apache.org/r1486716
Log:
Note on how to build the tgzs for release

Modified:
hbase/trunk/src/main/docbkx/developer.xml

Modified: hbase/trunk/src/main/docbkx/developer.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/developer.xml?rev=1486716r1=1486715r2=1486716view=diff
==
Binary files - no diff available.

svn commit: r1487571 - /hbase/trunk/conf/log4j.properties

[stack]

Author: stack
Date: Wed May 29 17:57:18 2013
New Revision: 1487571

URL: http://svn.apache.org/r1487571
Log:
HBASE-8643 Do not log full classnames in logs, just the last two levels

Modified:
hbase/trunk/conf/log4j.properties

Modified: hbase/trunk/conf/log4j.properties
URL: 
http://svn.apache.org/viewvc/hbase/trunk/conf/log4j.properties?rev=1487571r1=1487570r2=1487571view=diff
==
--- hbase/trunk/conf/log4j.properties (original)
+++ hbase/trunk/conf/log4j.properties Wed May 29 17:57:18 2013
@@ -24,7 +24,7 @@ log4j.appender.DRFA.DatePattern=.-MM
 log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
 
 # Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
 
 # Rolling File Appender properties
 hbase.log.maxfilesize=256MB
@@ -38,7 +38,7 @@ log4j.appender.RFA.MaxFileSize=${hbase.l
 log4j.appender.RFA.MaxBackupIndex=${hbase.log.maxbackupindex}
 
 log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
 
 #
 # Security audit appender

svn commit: r1487573 - /hbase/branches/0.95/conf/log4j.properties

[stack]

Author: stack
Date: Wed May 29 17:57:46 2013
New Revision: 1487573

URL: http://svn.apache.org/r1487573
Log:
HBASE-8643 Do not log full classnames in logs, just the last two levels

Modified:
hbase/branches/0.95/conf/log4j.properties

Modified: hbase/branches/0.95/conf/log4j.properties
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/conf/log4j.properties?rev=1487573r1=1487572r2=1487573view=diff
==
--- hbase/branches/0.95/conf/log4j.properties (original)
+++ hbase/branches/0.95/conf/log4j.properties Wed May 29 17:57:46 2013
@@ -24,7 +24,7 @@ log4j.appender.DRFA.DatePattern=.-MM
 log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
 
 # Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
 
 # Rolling File Appender properties
 hbase.log.maxfilesize=256MB
@@ -38,7 +38,7 @@ log4j.appender.RFA.MaxFileSize=${hbase.l
 log4j.appender.RFA.MaxBackupIndex=${hbase.log.maxbackupindex}
 
 log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
+log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
 
 #
 # Security audit appender

svn commit: r1487713 - /hbase/trunk/hbase-assembly/src/main/assembly/src.xml

[stack]

Author: stack
Date: Thu May 30 03:47:45 2013
New Revision: 1487713

URL: http://svn.apache.org/r1487713
Log:
HBASE-8654 src assembly does not include hbase-hadoop2-compat module

Modified:
hbase/trunk/hbase-assembly/src/main/assembly/src.xml

Modified: hbase/trunk/hbase-assembly/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-assembly/src/main/assembly/src.xml?rev=1487713r1=1487712r2=1487713view=diff
==
Binary files - no diff available.

svn commit: r1487714 - /hbase/branches/0.95/hbase-assembly/src/main/assembly/src.xml

[stack]

Author: stack
Date: Thu May 30 03:47:57 2013
New Revision: 1487714

URL: http://svn.apache.org/r1487714
Log:
HBASE-8654 src assembly does not include hbase-hadoop2-compat module

Modified:
hbase/branches/0.95/hbase-assembly/src/main/assembly/src.xml

Modified: hbase/branches/0.95/hbase-assembly/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-assembly/src/main/assembly/src.xml?rev=1487714r1=1487713r2=1487714view=diff
==
Binary files - no diff available.

svn commit: r1487935 - /hbase/trunk/src/main/docbkx/upgrading.xml

[stack]

Author: stack
Date: Thu May 30 17:12:14 2013
New Revision: 1487935

URL: http://svn.apache.org/r1487935
Log:
Add a bit of doc on the cleaning zk migration step

Modified:
hbase/trunk/src/main/docbkx/upgrading.xml

Modified: hbase/trunk/src/main/docbkx/upgrading.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/upgrading.xml?rev=1487935r1=1487934r2=1487935view=diff
==
Binary files - no diff available.

svn commit: r1487937 - /hbase/branches/0.95/bin/hbase-cleanup.sh

[stack]

Author: stack
Date: Thu May 30 17:16:01 2013
New Revision: 1487937

URL: http://svn.apache.org/r1487937
Log:
HBASE-7244 Provide a command or argument to startup, that formats znodes if 
provided; FORGOT TO SVN ADD bin/hbase-cleanup.sh

Added:
hbase/branches/0.95/bin/hbase-cleanup.sh

Added: hbase/branches/0.95/bin/hbase-cleanup.sh
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase-cleanup.sh?rev=1487937view=auto
==
--- hbase/branches/0.95/bin/hbase-cleanup.sh (added)
+++ hbase/branches/0.95/bin/hbase-cleanup.sh Thu May 30 17:16:01 2013
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+#
+#/**
+# * 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.
+# */
+#
+# cleans hbase related data from zookeeper and hdfs if no hbase process is 
alive.
+#
+# Environment Variables
+#
+#   HBASE_REGIONSERVERSFile naming remote hosts.
+# Default is ${HADOOP_CONF_DIR}/regionservers
+#   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
+#   HBASE_CONF_DIR  Alternate hbase conf dir. Default is ${HBASE_HOME}/conf.
+#   HADOOP_SLAVE_SLEEP Seconds to sleep between spawning remote commands.
+#   HADOOP_SLAVE_TIMEOUT Seconds to wait for timing out a remote command.
+#   HADOOP_SSH_OPTS Options passed to ssh when running remote commands.
+#
+
+usage=Usage: hbase-cleanup.sh (zk|hdfs|all)
+
+bin=`dirname $0`
+bin=`cd $bin/dev/null; pwd`
+
+# This will set HBASE_HOME, etc.
+. $bin/hbase-config.sh
+
+case $1 in
+  --cleanZk|--cleanHdfs|--cleanAll) 
+matches=yes ;;
+  *) ;;
+esac
+if [ $# -ne 1 -o $matches =  ]; then
+  echo $usage
+  exit 1;
+fi
+
+format_option=$1;
+
+distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
hbase.cluster.distributed | head -n 1`
+
+if [ $distMode == 'false' ];then
+  echo Skipping hbase data clearing in standalone mode. 21
+  exit 1;
+fi
+
+zparent=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
zookeeper.znode.parent`
+if [ $zparent == null ]; then zparent=/hbase; fi
+
+hrootdir=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.rootdir`
+if [ $hrootdir == null ]; then hrootdir=file:///tmp/hbase-${USER}/hbase; 
fi
+
+check_for_znodes() {
+  command=$1;
+  case $command in
+regionservers)
+  zchild=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
zookeeper.znode.rs`
+  if [ $zchild == null ]; then zchild=rs; fi
+  ;;
+backupmasters)
+  zchild=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
zookeeper.znode.backup.masters`
+  if [ $zchild == null ]; then zchild=backup-masters; fi
+  ;;
+  esac
+  znodes=`$bin/hbase zkcli ls $zparent/$zchild 21 | tail -1 | sed s/\[// 
| sed s/\]//`
+  if [ $znodes !=  ]; then
+echo -n ZNode(s) [${znodes}] of $command are not expired. Exiting without 
cleaning hbase data.
+echo #force a newline  
+exit 1;
+  else
+echo -n All ZNode(s) of $command are expired.
+  fi
+  echo #force a newline
+}
+
+execute_zk_command() {
+  command=$1;
+  $bin/hbase zkcli $command 21
+}
+
+execute_hdfs_command() {
+  command=$1;
+  $bin/hbase org.apache.hadoop.fs.FsShell $command 21
+}
+
+clean_up() {
+  case $1 in
+  --cleanZk) 
+execute_zk_command rmr ${zparent};
+;;
+  --cleanHdfs)
+execute_hdfs_command -rmr ${hrootdir}
+;;
+  --cleanAll)
+execute_zk_command rmr ${zparent};
+execute_hdfs_command -rmr ${hrootdir}
+;;
+  *)
+;;
+  esac 
+}
+
+check_znode_exists() {
+  command=$1
+  $bin/hbase zkcli stat $command 21 | grep Node does not 
exist\|Connection refused
+}
+
+check_znode_exists $zparent
+if [ $? -ne 0 ]; then
+  # make sure the online region server(s) znode(s) have been deleted before 
continuing
+  check_for_znodes regionservers
+  # make sure the backup master(s) znode(s) has been deleted before continuing
+  check_for_znodes backupmasters
+  # make sure the master znode has been deleted before continuing
+  zmaster=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
zookeeper.znode.master`
+  if [ $zmaster == null ]; then zmaster=master; fi
+zmaster=$zparent/$zmaster
+check_znode_exists $zmaster
+  if [ $? -ne 0 ]; then
+echo -n Master ZNode is not expired. Exiting

svn commit: r1487939 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-it/src/test/java/org/apache/hadoop/hbase/ hbase-server/src/main/java/org/apache/hadoop/hbase/ma

[stack]

Author: stack
Date: Thu May 30 17:20:44 2013
New Revision: 1487939

URL: http://svn.apache.org/r1487939
Log:
HBASE-8631 Meta Region First Recovery

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1487939r1=1487938r2=1487939view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 Thu May 30 17:20:44 2013
@@ -199,7 +199,8 @@ public abstract class ServerCallableT 
 
 // If the server is dead, we need to wait a little before retrying, to 
give
 //  a chance to the regions to be
-expectedSleep = ConnectionUtils.getPauseTime(pause, tries);
+// tries hasn't been bumped up yet so we use tries + 1 to get right 
pause time
+expectedSleep = ConnectionUtils.getPauseTime(pause, tries + 1);
 if (expectedSleep  MIN_WAIT_DEAD_SERVER 
  (location == null || 
getConnection().isDeadServer(location.getServerName( {
   expectedSleep = ConnectionUtils.addJitter(MIN_WAIT_DEAD_SERVER, 
0.10f);

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java?rev=1487939r1=1487938r2=1487939view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
 Thu May 30 17:20:44 2013
@@ -45,7 +45,7 @@ public abstract class IngestIntegrationT
 
   protected void setUp(int numSlavesBase, Configuration conf) throws Exception 
{
 tableName = this.getClass().getSimpleName();
-util = (conf == null) ? new IntegrationTestingUtility() : new 
IntegrationTestingUtility(conf);
+util = getTestingUtil(conf);
 LOG.info(Initializing cluster with  + numSlavesBase +  servers);
 util.initializeCluster(numSlavesBase);
 LOG.info(Done initializing cluster);
@@ -59,6 +59,17 @@ public abstract class IngestIntegrationT
 Assert.assertEquals(Failed to initialize LoadTestTool, 0, ret);
   }
 
+  protected IntegrationTestingUtility getTestingUtil(Configuration conf) {
+if (this.util == null) {
+  if (conf == null) {
+this.util = new IntegrationTestingUtility();
+  } else {
+this.util = new IntegrationTestingUtility(conf);
+  }
+}
+return util;
+  }
+
   protected void setUp(int numSlavesBase) throws Exception {
 setUp(numSlavesBase, null);
   }

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java?rev=1487939r1=1487938r2=1487939view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
 Thu May 30 17:20:44 2013
@@ -33,7 +33,7 @@ import org.junit.experimental.categories
 @Category(IntegrationTests.class)
 public class IntegrationTestDataIngestWithChaosMonkey extends 
IngestIntegrationTestBase {
 
-  private static final int NUM_SLAVES_BASE = 4; //number of slaves for the 
smallest cluster
+  private static int NUM_SLAVES_BASE = 4; //number of slaves for the smallest 
cluster
 
   // run for 5 min by default
   private static final long DEFAULT_RUN_TIME = 5 * 60 * 1000;
@@ -42,6

svn commit: r1487940 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-it/src/test/java/org/apache/hadoop/hbase/ hbase-server/src/main/java/org/apache/hadoop/

[stack]

Author: stack
Date: Thu May 30 17:21:22 2013
New Revision: 1487940

URL: http://svn.apache.org/r1487940
Log:
HBASE-8631 Meta Region First Recovery

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java

hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1487940r1=1487939r2=1487940view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 Thu May 30 17:21:22 2013
@@ -199,7 +199,8 @@ public abstract class ServerCallableT 
 
 // If the server is dead, we need to wait a little before retrying, to 
give
 //  a chance to the regions to be
-expectedSleep = ConnectionUtils.getPauseTime(pause, tries);
+// tries hasn't been bumped up yet so we use tries + 1 to get right 
pause time
+expectedSleep = ConnectionUtils.getPauseTime(pause, tries + 1);
 if (expectedSleep  MIN_WAIT_DEAD_SERVER 
  (location == null || 
getConnection().isDeadServer(location.getServerName( {
   expectedSleep = ConnectionUtils.addJitter(MIN_WAIT_DEAD_SERVER, 
0.10f);

Modified: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java?rev=1487940r1=1487939r2=1487940view=diff
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
 (original)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IngestIntegrationTestBase.java
 Thu May 30 17:21:22 2013
@@ -45,7 +45,7 @@ public abstract class IngestIntegrationT
 
   protected void setUp(int numSlavesBase, Configuration conf) throws Exception 
{
 tableName = this.getClass().getSimpleName();
-util = (conf == null) ? new IntegrationTestingUtility() : new 
IntegrationTestingUtility(conf);
+util = getTestingUtil(conf);
 LOG.info(Initializing cluster with  + numSlavesBase +  servers);
 util.initializeCluster(numSlavesBase);
 LOG.info(Done initializing cluster);
@@ -59,6 +59,17 @@ public abstract class IngestIntegrationT
 Assert.assertEquals(Failed to initialize LoadTestTool, 0, ret);
   }
 
+  protected IntegrationTestingUtility getTestingUtil(Configuration conf) {
+if (this.util == null) {
+  if (conf == null) {
+this.util = new IntegrationTestingUtility();
+  } else {
+this.util = new IntegrationTestingUtility(conf);
+  }
+}
+return util;
+  }
+
   protected void setUp(int numSlavesBase) throws Exception {
 setUp(numSlavesBase, null);
   }

Modified: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java?rev=1487940r1=1487939r2=1487940view=diff
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
 (original)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestWithChaosMonkey.java
 Thu May 30 17:21:22 2013
@@ -33,7 +33,7 @@ import org.junit.experimental.categories
 @Category(IntegrationTests.class)
 public class IntegrationTestDataIngestWithChaosMonkey extends 
IngestIntegrationTestBase {
 
-  private static final int NUM_SLAVES_BASE = 4; //number of slaves for the 
smallest cluster
+  private static int

svn commit: r1487945 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-common/src/main/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/hbase/ h

[stack]

Author: stack
Date: Thu May 30 17:31:15 2013
New Revision: 1487945

URL: http://svn.apache.org/r1487945
Log:
HBASE-8657 Miscellaneous log fixups for hbase-it; tidier logging, fix a few NPEs

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedWriter.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1487945r1=1487944r2=1487945view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Thu May 30 17:31:15 2013
@@ -93,9 +93,8 @@ public class ClientScanner extends Abstr
 public ClientScanner(final Configuration conf, final Scan scan,
   final byte[] tableName, HConnection connection) throws IOException {
   if (LOG.isDebugEnabled()) {
-LOG.debug(Creating scanner over 
-+ Bytes.toString(tableName)
-+  starting at key ' + Bytes.toStringBinary(scan.getStartRow()) 
+ ');
+LOG.debug(Scan table= + Bytes.toString(tableName)
++ , startRow= + Bytes.toStringBinary(scan.getStartRow()));
   }
   this.scan = scan;
   this.tableName = tableName;
@@ -192,7 +191,7 @@ public class ClientScanner extends Abstr
 done) {
   close();
   if (LOG.isDebugEnabled()) {
-LOG.debug(Finished scanning region  + this.currentRegion);
+LOG.debug(Finished region= + this.currentRegion);
   }
   return false;
 }

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1487945r1=1487944r2=1487945view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Thu May 30 17:31:15 2013
@@ -1188,14 +1188,18 @@ public class HConnectionManager {
 }
   }
   if (isNewCacheEntry) {
-LOG.debug(Cached location for  +
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Cached location for  +
 location.getRegionInfo().getRegionNameAsString() +
  is  + location.getHostnamePort());
+}
   } else if (isStaleUpdate  !location.equals(oldLocation)) {
-LOG.debug(Ignoring stale location update for 
-  + location.getRegionInfo().getRegionNameAsString() + : 
-  + location.getHostnamePort() +  at  + location.getSeqNum() + ; 
local 
-  + oldLocation.getHostnamePort() +  at  + oldLocation.getSeqNum());
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Ignoring stale location update for 
++ location.getRegionInfo().getRegionNameAsString() + : 
++ location.getHostnamePort() +  at  + location.getSeqNum() + ; 
local 
++ oldLocation.getHostnamePort() +  at  + 
oldLocation.getSeqNum());
+}
   }
 }
 
@@ -1388,7 +1392,7 @@ public class HConnectionManager {
 // tries at this point is 1 or more; decrement to start from 0.
 long pauseTime = ConnectionUtils.getPauseTime(pause, tries - 
1);
 LOG.info(getMaster attempt  + tries +  of  + numTries +
- failed; retrying after sleep of  +pauseTime + , 
exception= +
+ failed; retrying after sleep of  + pauseTime + , 
exception= +
   exceptionCaught);
 
 try {
@@ -2217,10 +2221,11 @@ public class HConnectionManager {
   if (LOG.isTraceEnabled()  isRetry) {
 StringBuilder sb = new StringBuilder();
 for (ActionR action : e.getValue().allActions

svn commit: r1487944 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-common/src/main/java/org/apache/hadoop/hbase/ hbase-it/src/test/java/org/apache/hadoop/

[stack]

Author: stack
Date: Thu May 30 17:30:44 2013
New Revision: 1487944

URL: http://svn.apache.org/r1487944
Log:
HBASE-8657 Miscellaneous log fixups for hbase-it; tidier logging, fix a few NPEs

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedWithDetailsException.java

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

hbase/branches/0.95/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDataIngestSlowDeterministic.java

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java

hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/util/MultiThreadedWriter.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1487944r1=1487943r2=1487944view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Thu May 30 17:30:44 2013
@@ -93,9 +93,8 @@ public class ClientScanner extends Abstr
 public ClientScanner(final Configuration conf, final Scan scan,
   final byte[] tableName, HConnection connection) throws IOException {
   if (LOG.isDebugEnabled()) {
-LOG.debug(Creating scanner over 
-+ Bytes.toString(tableName)
-+  starting at key ' + Bytes.toStringBinary(scan.getStartRow()) 
+ ');
+LOG.debug(Scan table= + Bytes.toString(tableName)
++ , startRow= + Bytes.toStringBinary(scan.getStartRow()));
   }
   this.scan = scan;
   this.tableName = tableName;
@@ -192,7 +191,7 @@ public class ClientScanner extends Abstr
 done) {
   close();
   if (LOG.isDebugEnabled()) {
-LOG.debug(Finished scanning region  + this.currentRegion);
+LOG.debug(Finished region= + this.currentRegion);
   }
   return false;
 }

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1487944r1=1487943r2=1487944view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Thu May 30 17:30:44 2013
@@ -1188,14 +1188,18 @@ public class HConnectionManager {
 }
   }
   if (isNewCacheEntry) {
-LOG.debug(Cached location for  +
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Cached location for  +
 location.getRegionInfo().getRegionNameAsString() +
  is  + location.getHostnamePort());
+}
   } else if (isStaleUpdate  !location.equals(oldLocation)) {
-LOG.debug(Ignoring stale location update for 
-  + location.getRegionInfo().getRegionNameAsString() + : 
-  + location.getHostnamePort() +  at  + location.getSeqNum() + ; 
local 
-  + oldLocation.getHostnamePort() +  at  + oldLocation.getSeqNum());
+if (LOG.isTraceEnabled()) {
+  LOG.trace(Ignoring stale location update for 
++ location.getRegionInfo().getRegionNameAsString() + : 
++ location.getHostnamePort() +  at  + location.getSeqNum() + ; 
local 
++ oldLocation.getHostnamePort() +  at  + 
oldLocation.getSeqNum());
+}
   }
 }
 
@@ -1388,7 +1392,7 @@ public class HConnectionManager {
 // tries at this point is 1 or more; decrement to start from 0.
 long pauseTime = ConnectionUtils.getPauseTime(pause, tries - 
1);
 LOG.info(getMaster attempt  + tries +  of  + numTries +
- failed; retrying after sleep of  +pauseTime + , 
exception= +
+ failed; retrying after sleep of  + pauseTime + , 
exception= +
   exceptionCaught);
 
 try {
@@ -2217,10 +2221,11 @@ public class HConnectionManager {
   if (LOG.isTraceEnabled()  isRetry

svn commit: r1488005 - /hbase/trunk/src/main/docbkx/upgrading.xml

[stack]

Author: stack
Date: Thu May 30 20:51:45 2013
New Revision: 1488005

URL: http://svn.apache.org/r1488005
Log:
Note on how zk has to be up and running to migrate/clean zk

Modified:
hbase/trunk/src/main/docbkx/upgrading.xml

Modified: hbase/trunk/src/main/docbkx/upgrading.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/upgrading.xml?rev=1488005r1=1488004r2=1488005view=diff
==
Binary files - no diff available.

svn commit: r1488046 - in /hbase/branches/0.95/bin: hbase hbase-cleanup.sh

[stack]

Author: stack
Date: Thu May 30 23:11:51 2013
New Revision: 1488046

URL: http://svn.apache.org/r1488046
Log:
HBASE-8658 hbase clean is deaf to the --config DIR option

Modified:
hbase/branches/0.95/bin/hbase
hbase/branches/0.95/bin/hbase-cleanup.sh

Modified: hbase/branches/0.95/bin/hbase
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase?rev=1488046r1=1488045r2=1488046view=diff
==
--- hbase/branches/0.95/bin/hbase (original)
+++ hbase/branches/0.95/bin/hbase Thu May 30 23:11:51 2013
@@ -321,7 +321,7 @@ elif [ $COMMAND = clean ] ; then
 echo --cleanAll  cleans hbase related data from both zookeeper 
and hdfs.
 exit 1;
   fi
-  $bin/hbase-cleanup.sh $@
+  $bin/hbase-cleanup.sh --config ${HBASE_CONF_DIR} $@
   exit $?
 
 elif [ $COMMAND = classpath ] ; then

Modified: hbase/branches/0.95/bin/hbase-cleanup.sh
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase-cleanup.sh?rev=1488046r1=1488045r2=1488046view=diff
==
--- hbase/branches/0.95/bin/hbase-cleanup.sh (original)
+++ hbase/branches/0.95/bin/hbase-cleanup.sh Thu May 30 23:11:51 2013
@@ -51,7 +51,7 @@ fi
 
 format_option=$1;
 
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
hbase.cluster.distributed | head -n 1`
+distMode=`$bin/hbase --config ${HBASE_CONF_DIR} 
org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 
1`
 
 if [ $distMode == 'false' ];then
   echo Skipping hbase data clearing in standalone mode. 21

svn commit: r1488045 - in /hbase/trunk/bin: hbase hbase-cleanup.sh

[stack]

Author: stack
Date: Thu May 30 23:11:17 2013
New Revision: 1488045

URL: http://svn.apache.org/r1488045
Log:
HBASE-8658 hbase clean is deaf to the --config DIR option

Modified:
hbase/trunk/bin/hbase
hbase/trunk/bin/hbase-cleanup.sh

Modified: hbase/trunk/bin/hbase
URL: 
http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1488045r1=1488044r2=1488045view=diff
==
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Thu May 30 23:11:17 2013
@@ -321,7 +321,7 @@ elif [ $COMMAND = clean ] ; then
 echo --cleanAll  cleans hbase related data from both zookeeper 
and hdfs.
 exit 1;
   fi
-  $bin/hbase-cleanup.sh $@
+  $bin/hbase-cleanup.sh --config ${HBASE_CONF_DIR} $@
   exit $?
 
 elif [ $COMMAND = classpath ] ; then

Modified: hbase/trunk/bin/hbase-cleanup.sh
URL: 
http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-cleanup.sh?rev=1488045r1=1488044r2=1488045view=diff
==
--- hbase/trunk/bin/hbase-cleanup.sh (original)
+++ hbase/trunk/bin/hbase-cleanup.sh Thu May 30 23:11:17 2013
@@ -51,7 +51,7 @@ fi
 
 format_option=$1;
 
-distMode=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool 
hbase.cluster.distributed | head -n 1`
+distMode=`$bin/hbase --config ${HBASE_CONF_DIR} 
org.apache.hadoop.hbase.util.HBaseConfTool hbase.cluster.distributed | head -n 
1`
 
 if [ $distMode == 'false' ];then
   echo Skipping hbase data clearing in standalone mode. 21

svn commit: r1488834 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[stack]

Author: stack
Date: Mon Jun  3 03:47:38 2013
New Revision: 1488834

URL: http://svn.apache.org/r1488834
Log:
HBASE-8640 ServerName in master may not initialize with the configured ipc 
address of hbase.master.ipc.address

Modified:

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1488834r1=1488833r2=1488834view=diff
==
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
 Mon Jun  3 03:47:38 2013
@@ -380,23 +380,16 @@ MasterServices, Server {
 // Disable the block cache on the master
 this.conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);
 // Server to handle client requests.
-String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
-  conf.get(hbase.master.dns.interface, default),
-  conf.get(hbase.master.dns.nameserver, default)));
+String hostname = conf.get(hbase.master.ipc.address,
+  Strings.domainNamePointerToHostName(DNS.getDefaultHost(
+conf.get(hbase.master.dns.interface, default),
+conf.get(hbase.master.dns.nameserver, default;
 int port = conf.getInt(HConstants.MASTER_PORT, 
HConstants.DEFAULT_MASTER_PORT);
 // Test that the hostname is reachable
 InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);
 if (initialIsa.getAddress() == null) {
   throw new IllegalArgumentException(Failed resolve of hostname  + 
initialIsa);
 }
-// Verify that the bind address is reachable if set
-String bindAddress = conf.get(hbase.master.ipc.address);
-if (bindAddress != null) {
-  initialIsa = new InetSocketAddress(bindAddress, port);
-  if (initialIsa.getAddress() == null) {
-throw new IllegalArgumentException(Failed resolve of bind address  + 
initialIsa);
-  }
-}
 String name = master/ + initialIsa.toString();
 // Set how many times to retry talking to another server over HConnection.
 HConnectionManager.setServerSideHConnectionRetries(this.conf, name, LOG);
@@ -410,7 +403,8 @@ MasterServices, Server {
   0); // this is a DNC w/o high priority handlers
 // Set our address.
 this.isa = this.rpcServer.getListenerAddress();
-this.serverName = new ServerName(hostname, this.isa.getPort(), 
System.currentTimeMillis());
+this.serverName =
+new ServerName(this.isa.getHostName(), this.isa.getPort(), 
System.currentTimeMillis());
 this.rsFatals = new MemoryBoundedLogMessageBuffer(
   conf.getLong(hbase.master.buffer.for.rs.fatals, 1*1024*1024));
 

svn commit: r1488836 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[stack]

Author: stack
Date: Mon Jun  3 03:50:35 2013
New Revision: 1488836

URL: http://svn.apache.org/r1488836
Log:
HBASE-8640 ServerName in master may not initialize with the configured ipc 
address of hbase.master.ipc.address

Modified:

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1488836r1=1488835r2=1488836view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
 Mon Jun  3 03:50:35 2013
@@ -380,23 +380,16 @@ MasterServices, Server {
 // Disable the block cache on the master
 this.conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);
 // Server to handle client requests.
-String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
-  conf.get(hbase.master.dns.interface, default),
-  conf.get(hbase.master.dns.nameserver, default)));
+String hostname = conf.get(hbase.master.ipc.address,
+  Strings.domainNamePointerToHostName(DNS.getDefaultHost(
+conf.get(hbase.master.dns.interface, default),
+conf.get(hbase.master.dns.nameserver, default;
 int port = conf.getInt(HConstants.MASTER_PORT, 
HConstants.DEFAULT_MASTER_PORT);
 // Test that the hostname is reachable
 InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);
 if (initialIsa.getAddress() == null) {
   throw new IllegalArgumentException(Failed resolve of hostname  + 
initialIsa);
 }
-// Verify that the bind address is reachable if set
-String bindAddress = conf.get(hbase.master.ipc.address);
-if (bindAddress != null) {
-  initialIsa = new InetSocketAddress(bindAddress, port);
-  if (initialIsa.getAddress() == null) {
-throw new IllegalArgumentException(Failed resolve of bind address  + 
initialIsa);
-  }
-}
 String name = master/ + initialIsa.toString();
 // Set how many times to retry talking to another server over HConnection.
 HConnectionManager.setServerSideHConnectionRetries(this.conf, name, LOG);
@@ -410,7 +403,8 @@ MasterServices, Server {
   0); // this is a DNC w/o high priority handlers
 // Set our address.
 this.isa = this.rpcServer.getListenerAddress();
-this.serverName = new ServerName(hostname, this.isa.getPort(), 
System.currentTimeMillis());
+this.serverName =
+new ServerName(this.isa.getHostName(), this.isa.getPort(), 
System.currentTimeMillis());
 this.rsFatals = new MemoryBoundedLogMessageBuffer(
   conf.getLong(hbase.master.buffer.for.rs.fatals, 1*1024*1024));
 

svn commit: r1488837 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

[stack]

Author: stack
Date: Mon Jun  3 03:51:52 2013
New Revision: 1488837

URL: http://svn.apache.org/r1488837
Log:
HBASE-8640 ServerName in master may not initialize with the configured ipc 
address of hbase.master.ipc.address

Modified:

hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

Modified: 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1488837r1=1488836r2=1488837view=diff
==
--- 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
(original)
+++ 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
Mon Jun  3 03:51:52 2013
@@ -284,23 +284,16 @@ Server {
 // Set how many times to retry talking to another server over HConnection.
 HConnectionManager.setServerSideHConnectionRetries(this.conf, LOG);
 // Server to handle client requests.
-String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
-  conf.get(hbase.master.dns.interface, default),
-  conf.get(hbase.master.dns.nameserver, default)));
+String hostname = conf.get(hbase.master.ipc.address,
+  Strings.domainNamePointerToHostName(DNS.getDefaultHost(
+conf.get(hbase.master.dns.interface, default),
+conf.get(hbase.master.dns.nameserver, default;
 int port = conf.getInt(HConstants.MASTER_PORT, 
HConstants.DEFAULT_MASTER_PORT);
 // Test that the hostname is reachable
 InetSocketAddress initialIsa = new InetSocketAddress(hostname, port);
 if (initialIsa.getAddress() == null) {
   throw new IllegalArgumentException(Failed resolve of hostname  + 
initialIsa);
 }
-// Verify that the bind address is reachable if set
-String bindAddress = conf.get(hbase.master.ipc.address);
-if (bindAddress != null) {
-  initialIsa = new InetSocketAddress(bindAddress, port);
-  if (initialIsa.getAddress() == null) {
-throw new IllegalArgumentException(Failed resolve of bind address  + 
initialIsa);
-  }
-}
 int numHandlers = conf.getInt(hbase.master.handler.count,
   conf.getInt(hbase.regionserver.handler.count, 25));
 this.rpcServer = HBaseRPC.getServer(this,
@@ -313,7 +306,7 @@ Server {
 0); // this is a DNC w/o high priority handlers
 // Set our address.
 this.isa = this.rpcServer.getListenerAddress();
-this.serverName = new ServerName(hostname,
+this.serverName = new ServerName(this.isa.getHostName(),
   this.isa.getPort(), System.currentTimeMillis());
 this.rsFatals = new MemoryBoundedLogMessageBuffer(
 conf.getLong(hbase.master.buffer.for.rs.fatals, 1*1024*1024));

svn commit: r1490072 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ hbase-server/src/main/java/org/apache/hadoop/hbas

[stack]

Author: stack
Date: Wed Jun  5 23:16:20 2013
New Revision: 1490072

URL: http://svn.apache.org/r1490072
Log:
HBASE-8645 Change ServerName so it uses hostname only, not FQDN hostnames

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java

hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java?rev=1490072r1=1490071r2=1490072view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java 
(original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java 
Wed Jun  5 23:16:20 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.hadoop.hbase;
 
+import com.google.common.net.InetAddresses;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -33,16 +34,15 @@ import java.util.regex.Pattern;
 
 /**
  * Instance of an HBase ServerName.
- * A server name is used uniquely identifying a server instance and is made
- * of the combination of hostname, port, and startcode. The startcode
- * distingushes restarted servers on same hostname and port (startcode is
- * usually timestamp of server startup). The {@link #toString()} format of
- * ServerName is safe to use in the  filesystem and as znode name up in
- * ZooKeeper.  Its format is:
+ * A server name is used uniquely identifying a server instance in a cluster 
and is made
+ * of the combination of hostname, port, and startcode.  The startcode 
distingushes restarted
+ * servers on same hostname and port (startcode is usually timestamp of server 
startup). The
+ * {@link #toString()} format of ServerName is safe to use in the  filesystem 
and as znode name
+ * up in ZooKeeper.  Its format is:
  * codelt;hostname '{@link #SERVERNAME_SEPARATOR}' lt;port '{@link 
#SERVERNAME_SEPARATOR}' lt;startcode/code.
- * For example, if hostname is codeexample.org/code, port is 
code1234/code,
+ * For example, if hostname is codewww.example.org/code, port is 
code1234/code,
  * and the startcode for the regionserver is code1212121212/code, then
- * the {@link #toString()} would be codeexample.org,1234,1212121212/code.
+ * the {@link #toString()} would be 
codewww.example.org,1234,1212121212/code.
  * 
  * pYou can obtain a versioned serialized form of this class by calling
  * {@link #getVersionedBytes()}.  To deserialize, call {@link 
#parseVersionedServerName(byte[])}
@@ -83,7 +83,7 @@ public class ServerName implements Compa
   public static final String UNKNOWN_SERVERNAME = #unknown#;
 
   private final String servername;
-  private final String hostname;
+  private final String hostnameOnly;
   private final int port;
   private final long startcode;
 
@@ -95,10 +95,23 @@ public class ServerName implements Compa
   public static final ListServerName EMPTY_SERVER_LIST = new 
ArrayListServerName(0);
 
   public ServerName(final String hostname, final int port, final long 
startcode) {
-this.hostname = hostname;
+// Drop the domain is there is one; no need of it in a local cluster.  
With it, we get long
+// unwieldy names.
+this.hostnameOnly = hostname;
 this.port = port;
 this.startcode = startcode;
-this.servername = getServerName(hostname, port, startcode);
+this.servername = getServerName(this.hostnameOnly, port, startcode);
+  }
+
+  /**
+   * @param hostname
+   * @return hostname minus the domain, if there is one (will do pass-through 
on ip addresses)
+   */
+  static String getHostNameMinusDomain(final String hostname) {
+if (InetAddresses.isInetAddress(hostname)) return hostname;
+String [] parts = hostname.split(\\.);
+if (parts == null || parts.length == 0) return hostname;
+return parts[0];
   }
 
   public ServerName(final String serverName) {
@@ -135,6 +148,16 @@ public class ServerName implements Compa
   }
 
   /**
+   * @return Return a SHORT version of {@link ServerName#toString()}, one that 
has the host only,
+   * minus the domain, and the port only -- no start code; the String is for 
us internally mostly
+   * tying threads to their server.  Not for external use.  It is lossy and 
will not work

svn commit: r1490073 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/ hbase-server/src/main/java/org/apache/hadoop/hbase/master/ hbase-server/src/main/java/org/apache/had

[stack]

Author: stack
Date: Wed Jun  5 23:16:52 2013
New Revision: 1490073

URL: http://svn.apache.org/r1490073
Log:
HBASE-8645 Change ServerName so it uses hostname only, not FQDN hostnames

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java

hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java

hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java?rev=1490073r1=1490072r2=1490073view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java
 Wed Jun  5 23:16:52 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.hadoop.hbase;
 
+import com.google.common.net.InetAddresses;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -33,16 +34,15 @@ import java.util.regex.Pattern;
 
 /**
  * Instance of an HBase ServerName.
- * A server name is used uniquely identifying a server instance and is made
- * of the combination of hostname, port, and startcode. The startcode
- * distingushes restarted servers on same hostname and port (startcode is
- * usually timestamp of server startup). The {@link #toString()} format of
- * ServerName is safe to use in the  filesystem and as znode name up in
- * ZooKeeper.  Its format is:
+ * A server name is used uniquely identifying a server instance in a cluster 
and is made
+ * of the combination of hostname, port, and startcode.  The startcode 
distingushes restarted
+ * servers on same hostname and port (startcode is usually timestamp of server 
startup). The
+ * {@link #toString()} format of ServerName is safe to use in the  filesystem 
and as znode name
+ * up in ZooKeeper.  Its format is:
  * codelt;hostname '{@link #SERVERNAME_SEPARATOR}' lt;port '{@link 
#SERVERNAME_SEPARATOR}' lt;startcode/code.
- * For example, if hostname is codeexample.org/code, port is 
code1234/code,
+ * For example, if hostname is codewww.example.org/code, port is 
code1234/code,
  * and the startcode for the regionserver is code1212121212/code, then
- * the {@link #toString()} would be codeexample.org,1234,1212121212/code.
+ * the {@link #toString()} would be 
codewww.example.org,1234,1212121212/code.
  * 
  * pYou can obtain a versioned serialized form of this class by calling
  * {@link #getVersionedBytes()}.  To deserialize, call {@link 
#parseVersionedServerName(byte[])}
@@ -83,7 +83,7 @@ public class ServerName implements Compa
   public static final String UNKNOWN_SERVERNAME = #unknown#;
 
   private final String servername;
-  private final String hostname;
+  private final String hostnameOnly;
   private final int port;
   private final long startcode;
 
@@ -95,10 +95,23 @@ public class ServerName implements Compa
   public static final ListServerName EMPTY_SERVER_LIST = new 
ArrayListServerName(0);
 
   public ServerName(final String hostname, final int port, final long 
startcode) {
-this.hostname = hostname;
+// Drop the domain is there is one; no need of it in a local cluster.  
With it, we get long
+// unwieldy names.
+this.hostnameOnly = hostname;
 this.port = port;
 this.startcode = startcode;
-this.servername = getServerName(hostname, port, startcode);
+this.servername = getServerName(this.hostnameOnly, port, startcode);
+  }
+
+  /**
+   * @param hostname
+   * @return hostname minus the domain, if there is one (will do pass-through 
on ip addresses)
+   */
+  static String getHostNameMinusDomain(final String hostname) {
+if (InetAddresses.isInetAddress(hostname)) return hostname;
+String [] parts = hostname.split(\\.);
+if (parts == null || parts.length == 0) return hostname;
+return parts[0];
   }
 
   public ServerName(final String serverName) {
@@ -135,6 +148,16 @@ public class ServerName implements Compa
   }
 
   /**
+   * @return Return a SHORT version of {@link ServerName#toString()}, one that 
has the host only,
+   * minus the domain, and the port only -- no start code; the String is for 
us internally mostly

svn commit: r1490093 - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSid

[stack]

Author: stack
Date: Thu Jun  6 00:43:31 2013
New Revision: 1490093

URL: http://svn.apache.org/r1490093
Log:
HBASE-8402 ScanMetrics depends on number of rpc calls to the server

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1490093r1=1490092r2=1490093view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Thu Jun  6 00:43:31 2013
@@ -64,7 +64,8 @@ public class ClientScanner extends Abstr
 private final HConnection connection;
 private final byte[] tableName;
 private final int scannerTimeout;
-
+private boolean scanMetricsPublished = false;
+
 /**
  * Create a new ClientScanner for the specified table. An HConnection will 
be
  * retrieved using the passed Configuration.
@@ -243,12 +244,13 @@ public class ClientScanner extends Abstr
  *
  * scan.setAttribute(SCAN_ATTRIBUTES_METRICS_ENABLE, 
Bytes.toBytes(Boolean.TRUE))
  */
-private void writeScanMetrics() throws IOException {
-  if (this.scanMetrics == null) {
+private void writeScanMetrics() {
+  if (this.scanMetrics == null || scanMetricsPublished) {
 return;
   }
   MapReduceProtos.ScanMetrics pScanMetrics = 
ProtobufUtil.toScanMetrics(scanMetrics);
   scan.setAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA, 
pScanMetrics.toByteArray());
+  scanMetricsPublished = true;
 }
 
 public Result next() throws IOException {
@@ -390,6 +392,7 @@ public class ClientScanner extends Abstr
 }
 
 public void close() {
+  if (!scanMetricsPublished) writeScanMetrics();
   if (callable != null) {
 callable.setClose();
 try {
@@ -399,13 +402,6 @@ public class ClientScanner extends Abstr
   // have since decided that it's not nice for a scanner's close to
   // throw exceptions. Chances are it was just an UnknownScanner
   // exception due to lease time out.
-} finally {
-  // we want to output the scan metrics even if an error occurred on 
close
-  try {
-writeScanMetrics();
-  } catch (IOException e) {
-// As above, we still don't want the scanner close() method to 
throw.
-  }
 }
 callable = null;
   }

Modified: 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1490093r1=1490092r2=1490093view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
 Thu Jun  6 00:43:31 2013
@@ -4618,9 +4618,8 @@ public class TestFromClientSide {
 for (Result result : scanner.next(numRecords - 1)) {
 }
 scanner.close();
-// need to have at one next roundtrip in order to collect metrics
-// here we have less than numRecord+1 KVs, so no metrics were collected
-assertNull(scan.getAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA));
+// closing the scanner will set the metrics.
+assertNotNull(scan.getAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA));
 
 // set caching to 1, becasue metrics are collected in each roundtrip only
 scan = new Scan();

svn commit: r1490094 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

[stack]

Author: stack
Date: Thu Jun  6 00:44:00 2013
New Revision: 1490094

URL: http://svn.apache.org/r1490094
Log:
HBASE-8402 ScanMetrics depends on number of rpc calls to the server

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java

hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java?rev=1490094r1=1490093r2=1490094view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
 Thu Jun  6 00:44:00 2013
@@ -64,7 +64,8 @@ public class ClientScanner extends Abstr
 private final HConnection connection;
 private final byte[] tableName;
 private final int scannerTimeout;
-
+private boolean scanMetricsPublished = false;
+
 /**
  * Create a new ClientScanner for the specified table. An HConnection will 
be
  * retrieved using the passed Configuration.
@@ -243,12 +244,13 @@ public class ClientScanner extends Abstr
  *
  * scan.setAttribute(SCAN_ATTRIBUTES_METRICS_ENABLE, 
Bytes.toBytes(Boolean.TRUE))
  */
-private void writeScanMetrics() throws IOException {
-  if (this.scanMetrics == null) {
+private void writeScanMetrics() {
+  if (this.scanMetrics == null || scanMetricsPublished) {
 return;
   }
   MapReduceProtos.ScanMetrics pScanMetrics = 
ProtobufUtil.toScanMetrics(scanMetrics);
   scan.setAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA, 
pScanMetrics.toByteArray());
+  scanMetricsPublished = true;
 }
 
 public Result next() throws IOException {
@@ -390,6 +392,7 @@ public class ClientScanner extends Abstr
 }
 
 public void close() {
+  if (!scanMetricsPublished) writeScanMetrics();
   if (callable != null) {
 callable.setClose();
 try {
@@ -399,13 +402,6 @@ public class ClientScanner extends Abstr
   // have since decided that it's not nice for a scanner's close to
   // throw exceptions. Chances are it was just an UnknownScanner
   // exception due to lease time out.
-} finally {
-  // we want to output the scan metrics even if an error occurred on 
close
-  try {
-writeScanMetrics();
-  } catch (IOException e) {
-// As above, we still don't want the scanner close() method to 
throw.
-  }
 }
 callable = null;
   }

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1490094r1=1490093r2=1490094view=diff
==
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
 Thu Jun  6 00:44:00 2013
@@ -4618,9 +4618,8 @@ public class TestFromClientSide {
 for (Result result : scanner.next(numRecords - 1)) {
 }
 scanner.close();
-// need to have at one next roundtrip in order to collect metrics
-// here we have less than numRecord+1 KVs, so no metrics were collected
-assertNull(scan.getAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA));
+// closing the scanner will set the metrics.
+assertNotNull(scan.getAttribute(Scan.SCAN_ATTRIBUTES_METRICS_DATA));
 
 // set caching to 1, becasue metrics are collected in each roundtrip only
 scan = new Scan();

svn commit: r1490467 - /hbase/trunk/src/main/docbkx/developer.xml

[stack]

Author: stack
Date: Thu Jun  6 22:55:55 2013
New Revision: 1490467

URL: http://svn.apache.org/r1490467
Log:
Add note on how to publish mvn snapshot for hadoop1 and hadoop2

Modified:
hbase/trunk/src/main/docbkx/developer.xml

Modified: hbase/trunk/src/main/docbkx/developer.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/developer.xml?rev=1490467r1=1490466r2=1490467view=diff
==
Binary files - no diff available.

svn commit: r1490511 - /hbase/trunk/src/main/site/xdoc/index.xml

[stack]

Author: stack
Date: Fri Jun  7 04:52:30 2013
New Revision: 1490511

URL: http://svn.apache.org/r1490511
Log:
Added hackathon notice

Modified:
hbase/trunk/src/main/site/xdoc/index.xml

Modified: hbase/trunk/src/main/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/site/xdoc/index.xml?rev=1490511r1=1490510r2=1490511view=diff
==
Binary files - no diff available.

svn commit: r1490722 - /hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

[stack]

Author: stack
Date: Fri Jun  7 16:53:49 2013
New Revision: 1490722

URL: http://svn.apache.org/r1490722
Log:
HBASE-8704 Log the table name in ServerCallable.prepare

Modified:

hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

Modified: 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1490722r1=1490721r2=1490722view=diff
==
--- 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 (original)
+++ 
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 Fri Jun  7 16:53:49 2013
@@ -95,7 +95,7 @@ public abstract class ServerCallableT 
   public void prepare(final boolean reload) throws IOException {
 this.location = connection.getRegionLocation(tableName, row, reload);
 if (this.location == null) {
-  throw new IOException(Failed to find location, tableName= + tableName 
+ , row= +
+  throw new IOException(Failed to find location, tableName= + 
Bytes.toString(tableName) + , row= +
 Bytes.toString(row) + , reload= + reload);
 }
 this.stub = connection.getClient(location.getServerName());

svn commit: r1490724 - /hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

[stack]

Author: stack
Date: Fri Jun  7 16:54:35 2013
New Revision: 1490724

URL: http://svn.apache.org/r1490724
Log:
HBASE-8704 Log the table name in ServerCallable.prepare

Modified:

hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java

Modified: 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1490724r1=1490723r2=1490724view=diff
==
--- 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 (original)
+++ 
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
 Fri Jun  7 16:54:35 2013
@@ -95,7 +95,7 @@ public abstract class ServerCallableT 
   public void prepare(final boolean reload) throws IOException {
 this.location = connection.getRegionLocation(tableName, row, reload);
 if (this.location == null) {
-  throw new IOException(Failed to find location, tableName= + tableName 
+ , row= +
+  throw new IOException(Failed to find location, tableName= + 
Bytes.toString(tableName) + , row= +
 Bytes.toString(row) + , reload= + reload);
 }
 this.stub = connection.getClient(location.getServerName());

svn commit: r1491018 - /hbase/branches/0.95/bin/hbase

[stack]

Author: stack
Date: Sat Jun  8 17:50:51 2013
New Revision: 1491018

URL: http://svn.apache.org/r1491018
Log:
HBASE-8686 Extra left brace in bin/hbase

Modified:
hbase/branches/0.95/bin/hbase

Modified: hbase/branches/0.95/bin/hbase
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase?rev=1491018r1=1491017r2=1491018view=diff
==
--- hbase/branches/0.95/bin/hbase (original)
+++ hbase/branches/0.95/bin/hbase Sat Jun  8 17:50:51 2013
@@ -356,7 +356,7 @@ fi
 
 # Exec unless HBASE_NOEXEC is set.
 if [ ${HBASE_NOEXEC} !=  ]; then
-  $JAVA -Dproc_$COMMAND {-XX:OnOutOfMemoryError=kill -9 %p $JAVA_HEAP_MAX 
$HBASE_OPTS -classpath $CLASSPATH $CLASS $@
+  $JAVA -Dproc_$COMMAND -XX:OnOutOfMemoryError=kill -9 %p $JAVA_HEAP_MAX 
$HBASE_OPTS -classpath $CLASSPATH $CLASS $@
 else
   exec $JAVA -Dproc_$COMMAND -XX:OnOutOfMemoryError=kill -9 %p 
$JAVA_HEAP_MAX $HBASE_OPTS -classpath $CLASSPATH $CLASS $@
 fi

svn commit: r1491019 - in /hbase/hbase.apache.org/trunk: ./ apidocs/ apidocs/org/apache/hadoop/hbase/ apidocs/org/apache/hadoop/hbase/backup/ apidocs/org/apache/hadoop/hbase/backup/class-use/ apidocs/

[stack]

Author: stack
Date: Sat Jun  8 17:51:22 2013
New Revision: 1491019

URL: http://svn.apache.org/r1491019
Log:
Update website


[This commit notification would consist of 249 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1491070 - /hbase/trunk/src/main/docbkx/ops_mgt.xml

[stack]

Author: stack
Date: Sat Jun  8 21:38:37 2013
New Revision: 1491070

URL: http://svn.apache.org/r1491070
Log:
Edit of the decommisioning nodes section

Modified:
hbase/trunk/src/main/docbkx/ops_mgt.xml

Modified: hbase/trunk/src/main/docbkx/ops_mgt.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/ops_mgt.xml?rev=1491070r1=1491069r2=1491070view=diff
==
Binary files - no diff available.

svn commit: r1491536 - /hbase/trunk/src/main/docbkx/getting_started.xml

[stack]

Author: stack
Date: Mon Jun 10 17:42:44 2013
New Revision: 1491536

URL: http://svn.apache.org/r1491536
Log:
Fix link 

Modified:
hbase/trunk/src/main/docbkx/getting_started.xml

Modified: hbase/trunk/src/main/docbkx/getting_started.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/getting_started.xml?rev=1491536r1=1491535r2=1491536view=diff
==
Binary files - no diff available.

svn commit: r1491573 - /hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

[stack]

Author: stack
Date: Mon Jun 10 19:32:13 2013
New Revision: 1491573

URL: http://svn.apache.org/r1491573
Log:
HBASE-8637 IntegrationTestBigLinkedListWithChaosMonkey uses the wrong table name

Modified:

hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

Modified: 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java?rev=1491573r1=1491572r2=1491573view=diff
==
--- 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 (original)
+++ 
hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 Mon Jun 10 19:32:13 2013
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.test;
 import java.io.IOException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.IntegrationTests;
 import org.apache.hadoop.hbase.util.ChaosMonkey;
@@ -44,8 +45,13 @@ public class IntegrationTestBigLinkedLis
 
   public IntegrationTestBigLinkedListWithChaosMonkey() {
 super();
-TABLE_NAME_KEY = IntegrationTestBigLinkedListWithChaosMonkey.table;
-DEFAULT_TABLE_NAME = IntegrationTestBigLinkedListWithChaosMonkey;
+Configuration conf = getConf();
+if (conf != null) {
+  conf.set(TABLE_NAME_KEY, IntegrationTestBigLinkedListWithChaosMonkey);
+} else {
+  this.getTestingUtil().getConfiguration()
+  .set(TABLE_NAME_KEY, IntegrationTestBigLinkedListWithChaosMonkey);
+}
   }
 
   @Before
@@ -90,7 +96,7 @@ public class IntegrationTestBigLinkedLis
 test.setUp();
 
 // run the test
-int ret = ToolRunner.run(test.getConf(), test, args);
+int ret = ToolRunner.run(test.getTestingUtil().getConfiguration(), test, 
args);
 
 test.tearDown();
 System.exit(ret);

svn commit: r1491574 - /hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

[stack]

Author: stack
Date: Mon Jun 10 19:32:49 2013
New Revision: 1491574

URL: http://svn.apache.org/r1491574
Log:
HBASE-8637 IntegrationTestBigLinkedListWithChaosMonkey uses the wrong table name

Modified:

hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java

Modified: 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java?rev=1491574r1=1491573r2=1491574view=diff
==
--- 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 (original)
+++ 
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java
 Mon Jun 10 19:32:49 2013
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.test;
 import java.io.IOException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
 import org.apache.hadoop.hbase.IntegrationTests;
 import org.apache.hadoop.hbase.util.ChaosMonkey;
@@ -44,8 +45,13 @@ public class IntegrationTestBigLinkedLis
 
   public IntegrationTestBigLinkedListWithChaosMonkey() {
 super();
-TABLE_NAME_KEY = IntegrationTestBigLinkedListWithChaosMonkey.table;
-DEFAULT_TABLE_NAME = IntegrationTestBigLinkedListWithChaosMonkey;
+Configuration conf = getConf();
+if (conf != null) {
+  conf.set(TABLE_NAME_KEY, IntegrationTestBigLinkedListWithChaosMonkey);
+} else {
+  this.getTestingUtil().getConfiguration()
+  .set(TABLE_NAME_KEY, IntegrationTestBigLinkedListWithChaosMonkey);
+}
   }
 
   @Before
@@ -90,7 +96,7 @@ public class IntegrationTestBigLinkedLis
 test.setUp();
 
 // run the test
-int ret = ToolRunner.run(test.getConf(), test, args);
+int ret = ToolRunner.run(test.getTestingUtil().getConfiguration(), test, 
args);
 
 test.tearDown();
 System.exit(ret);

svn commit: r1491833 - in /hbase/trunk/src/main/site/xdoc: index.xml old_news.xml

[stack]

Author: stack
Date: Tue Jun 11 15:20:38 2013
New Revision: 1491833

URL: http://svn.apache.org/r1491833
Log:
Add hadoop summit meetup and kijicon

Modified:
hbase/trunk/src/main/site/xdoc/index.xml
hbase/trunk/src/main/site/xdoc/old_news.xml

Modified: hbase/trunk/src/main/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/site/xdoc/index.xml?rev=1491833r1=1491832r2=1491833view=diff
==
Binary files - no diff available.

Modified: hbase/trunk/src/main/site/xdoc/old_news.xml
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/site/xdoc/old_news.xml?rev=1491833r1=1491832r2=1491833view=diff
==
Binary files - no diff available.

svn commit: r1491842 - in /hbase/hbase.apache.org/trunk: ./ apidocs/ apidocs/org/apache/hadoop/hbase/ apidocs/org/apache/hadoop/hbase/backup/ apidocs/org/apache/hadoop/hbase/backup/class-use/ apidocs/

[stack]

Author: stack
Date: Tue Jun 11 15:36:24 2013
New Revision: 1491842

URL: http://svn.apache.org/r1491842
Log:
Update site w/ new notices


[This commit notification would consist of 88 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1491902 - in /hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl: master/RegionServerListTmpl.jamon regionserver/RegionListTmpl.jamon regionserver/ServerMetricsTmpl.jamo

[stack]

Author: stack
Date: Tue Jun 11 18:53:06 2013
New Revision: 1491902

URL: http://svn.apache.org/r1491902
Log:
HBASE-8664 Small fix ups for memory size outputs in UI

Modified:

hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon

hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon

hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon

Modified: 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon?rev=1491902r1=1491901r2=1491902view=diff
==
--- 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 (original)
+++ 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 Tue Jun 11 18:53:06 2013
@@ -142,9 +142,9 @@ for (ServerName serverName: serverNames)
 /%java
 tr
 td serverNameLink; serverName=serverName; serverLoad = sl; /td
-td% sl.getUsedHeapMB() %MB/td
-td% sl.getMaxHeapMB() %MB/td
-td% sl.getMemstoreSizeInMB() %MB/td
+td% sl.getUsedHeapMB() %m/td
+td% sl.getMaxHeapMB() %m/td
+td% sl.getMemstoreSizeInMB() %m/td
 
 /tr
 %java
@@ -218,10 +218,10 @@ if (sl != null) {
 td serverNameLink; serverName=serverName; serverLoad = sl; /td
 td% sl.getStores() %/td
 td% sl.getStorefiles() %/td
-td% sl.getStoreUncompressedSizeMB() %MB/td
-td% sl.getStorefileSizeInMB() %MB/td
-td% sl.getTotalStaticIndexSizeKB() %KB/td
-td% sl.getTotalStaticBloomSizeKB() %KB/td
+td% sl.getStoreUncompressedSizeMB() %m/td
+td% sl.getStorefileSizeInMB() %mb/td
+td% sl.getTotalStaticIndexSizeKB() %k/td
+td% sl.getTotalStaticBloomSizeKB() %k/td
 /tr
 %java
 }  else {

Modified: 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon?rev=1491902r1=1491901r2=1491902view=diff
==
--- 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
 (original)
+++ 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
 Tue Jun 11 18:53:06 2013
@@ -152,10 +152,10 @@
 %if load != null %
 td% load.getStores() %/td
 td% load.getStorefiles() %/td
-td% load.getStoreUncompressedSizeMB() %MB/td
-td% load.getStorefileSizeMB() %MB/td
-td% load.getTotalStaticIndexSizeKB() %KB/td
-td% load.getTotalStaticBloomSizeKB() %KB/td
+td% load.getStoreUncompressedSizeMB() %m/td
+td% load.getStorefileSizeMB() %m/td
+td% load.getTotalStaticIndexSizeKB() %k/td
+td% load.getTotalStaticBloomSizeKB() %k/td
 /%if
 /tr
 /%for
@@ -215,7 +215,7 @@
 /%java
 td% r.getRegionNameAsString() %/td
 %if load != null %
-td% load.getMemstoreSizeMB() %MB/td
+td% load.getMemstoreSizeMB() %m/td
 /%if
 /tr
 /%for

Modified: 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon?rev=1491902r1=1491901r2=1491902view=diff
==
--- 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
 (original)
+++ 
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
 Tue Jun 11 18:53:06 2013
@@ -31,6 +31,7 @@ org.apache.hadoop.hbase.protobuf.Protobu
 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
 org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram;
+org.apache.hadoop.util.StringUtils;
 com.yammer.metrics.stats.Snapshot;
 java.lang.management.ManagementFactory;
 /%import
@@ -100,12 +101,12 @@ MetricsRegionServerWrapper mWrap;
 /tr
 tr
 td
-% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() 
%
+% 
StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed())
 %
 /td
 td
-% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()%
+% 
StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean

svn commit: r1491903 - in /hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl: master/RegionServerListTmpl.jamon regionserver/RegionListTmpl.jamon regionserver/ServerMetricsT

[stack]

Author: stack
Date: Tue Jun 11 18:53:34 2013
New Revision: 1491903

URL: http://svn.apache.org/r1491903
Log:
HBASE-8664 Small fix ups for memory size outputs in UI

Modified:

hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon

hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon

hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon

Modified: 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon?rev=1491903r1=1491902r2=1491903view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
 Tue Jun 11 18:53:34 2013
@@ -142,9 +142,9 @@ for (ServerName serverName: serverNames)
 /%java
 tr
 td serverNameLink; serverName=serverName; serverLoad = sl; /td
-td% sl.getUsedHeapMB() %MB/td
-td% sl.getMaxHeapMB() %MB/td
-td% sl.getMemstoreSizeInMB() %MB/td
+td% sl.getUsedHeapMB() %m/td
+td% sl.getMaxHeapMB() %m/td
+td% sl.getMemstoreSizeInMB() %m/td
 
 /tr
 %java
@@ -218,10 +218,10 @@ if (sl != null) {
 td serverNameLink; serverName=serverName; serverLoad = sl; /td
 td% sl.getStores() %/td
 td% sl.getStorefiles() %/td
-td% sl.getStoreUncompressedSizeMB() %MB/td
-td% sl.getStorefileSizeInMB() %MB/td
-td% sl.getTotalStaticIndexSizeKB() %KB/td
-td% sl.getTotalStaticBloomSizeKB() %KB/td
+td% sl.getStoreUncompressedSizeMB() %m/td
+td% sl.getStorefileSizeInMB() %mb/td
+td% sl.getTotalStaticIndexSizeKB() %k/td
+td% sl.getTotalStaticBloomSizeKB() %k/td
 /tr
 %java
 }  else {

Modified: 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon?rev=1491903r1=1491902r2=1491903view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
 Tue Jun 11 18:53:34 2013
@@ -152,10 +152,10 @@
 %if load != null %
 td% load.getStores() %/td
 td% load.getStorefiles() %/td
-td% load.getStoreUncompressedSizeMB() %MB/td
-td% load.getStorefileSizeMB() %MB/td
-td% load.getTotalStaticIndexSizeKB() %KB/td
-td% load.getTotalStaticBloomSizeKB() %KB/td
+td% load.getStoreUncompressedSizeMB() %m/td
+td% load.getStorefileSizeMB() %m/td
+td% load.getTotalStaticIndexSizeKB() %k/td
+td% load.getTotalStaticBloomSizeKB() %k/td
 /%if
 /tr
 /%for
@@ -215,7 +215,7 @@
 /%java
 td% r.getRegionNameAsString() %/td
 %if load != null %
-td% load.getMemstoreSizeMB() %MB/td
+td% load.getMemstoreSizeMB() %m/td
 /%if
 /tr
 /%for

Modified: 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon?rev=1491903r1=1491902r2=1491903view=diff
==
--- 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
 (original)
+++ 
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
 Tue Jun 11 18:53:34 2013
@@ -31,6 +31,7 @@ org.apache.hadoop.hbase.protobuf.Protobu
 org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
 org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
 org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram;
+org.apache.hadoop.util.StringUtils;
 com.yammer.metrics.stats.Snapshot;
 java.lang.management.ManagementFactory;
 /%import
@@ -100,12 +101,12 @@ MetricsRegionServerWrapper mWrap;
 /tr
 tr
 td
-% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() 
%
+% 
StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed())
 %
 /td
 td
-% ManagementFactory.getMemoryMXBean

svn commit: r1492042 - /hbase/tags/0.95.1RC1/

[stack]

Author: stack
Date: Wed Jun 12 03:56:11 2013
New Revision: 1492042

URL: http://svn.apache.org/r1492042
Log:
Forgot to tag 0.95.1RC1

Added:
hbase/tags/0.95.1RC1/   (props changed)
  - copied from r1490093, hbase/branches/0.95/

Propchange: hbase/tags/0.95.1RC1/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jun 12 03:56:11 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1RC1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 12 03:56:11 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1492043 - /hbase/tags/0.95.1/

[stack]

Author: stack
Date: Wed Jun 12 04:00:24 2013
New Revision: 1492043

URL: http://svn.apache.org/r1492043
Log:
Release 0.95.1RC1 as 0.95.1

Added:
hbase/tags/0.95.1/   (props changed)
  - copied from r1492042, hbase/tags/0.95.1RC1/

Propchange: hbase/tags/0.95.1/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jun 12 04:00:24 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 12 04:00:24 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1492045 - in /hbase/tags: 0.94.2mvn/ 0.94.2mvnrelease/ 0.94.3mvn/ 0.94.3mvn2/ 0.94.3mvn_release/ 0.94.4mvn/ 0.94.4mvn2/ 0.94.5mvn/ 0.94.5mvn2/ 0.94.6.1mvn-release2/ 0.94.6.1mvn/ 0.94.6mvn

[stack]

Author: stack
Date: Wed Jun 12 04:04:07 2013
New Revision: 1492045

URL: http://svn.apache.org/r1492045
Log:
Clean out old mvn repos

Removed:
hbase/tags/0.94.2mvn/
hbase/tags/0.94.2mvnrelease/
hbase/tags/0.94.3mvn/
hbase/tags/0.94.3mvn2/
hbase/tags/0.94.3mvn_release/
hbase/tags/0.94.4mvn/
hbase/tags/0.94.4mvn2/
hbase/tags/0.94.5mvn/
hbase/tags/0.94.5mvn2/
hbase/tags/0.94.6.1mvn/
hbase/tags/0.94.6.1mvn-release2/
hbase/tags/0.94.6mvn/
hbase/tags/0.94.6mvn-release/
hbase/tags/0.95.0mvn/
hbase/tags/0.95.0mvn-release/
hbase/tags/0.95.0mvnrelease/

svn commit: r1492046 - /hbase/tags/0.95.1mvn/

[stack]

Author: stack
Date: Wed Jun 12 04:10:25 2013
New Revision: 1492046

URL: http://svn.apache.org/r1492046
Log:
Make copy of release so can do mvn release

Added:
hbase/tags/0.95.1mvn/   (props changed)
  - copied from r1492045, hbase/tags/0.95.1/

Propchange: hbase/tags/0.95.1mvn/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jun 12 04:10:25 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1mvn/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 12 04:10:25 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1492047 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-hadoop2-compat/ hbase-it/ hbase-prefix-

[stack]

Author: stack
Date: Wed Jun 12 04:12:30 2013
New Revision: 1492047

URL: http://svn.apache.org/r1492047
Log:
Commit version w/ appended -hadoop1-SNAPSHOT

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 04:12:30 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 04:12:30 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 04:12:30 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 04:12:30 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 04:12:30 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml?rev=1492047r1=1492046r2=1492047view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml Wed Jun 12 04:12:30 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492047r1=1492046r2=1492047view=diff

svn commit: r1492049 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 04:16:53 2013
New Revision: 1492049

URL: http://svn.apache.org/r1492049
Log:
[maven-release-plugin] prepare release hbase-0.95.1-hadoop.mvnlabeling

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492049r1=1492048r2=1492049view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492049r1=1492048r2=1492049view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 04:16:53 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492049r1=1492048r2=1492049view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 04:16:53 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 
@@ -63,12 +63,11 @@
 phaseprocess-resources/phase
 configuration
   target
-replace 
file=${project.build.outputDirectory}/hbase-default.xml
-  token=@@@VERSION@@@ value=${project.version} /
-mkdir dir=${project.build.directory}/nativelib/
+replace 
file=${project.build.outputDirectory}/hbase-default.xml token=@@@VERSION@@@ 
value=${project.version} /
+mkdir dir=${project.build.directory}/nativelib /
 exec executable=tar 
dir=${project.build.directory}/nativelib failonerror=false
-  arg value=xf/
-  arg value=hadoop-snappy-nativelibs.tar/
+  arg value=xf /
+  arg value=hadoop-snappy-nativelibs.tar /
 /exec
   /target
 /configuration
@@ -82,10 +81,10 @@
 phasegenerate-sources/phase
 configuration
 target
-property name=generated.sources 
location=${project.build.directory}/generated-sources/
+property name=generated.sources 
location=${project.build.directory}/generated-sources /
 
 exec executable=sh
-arg line=${basedir}/src/saveVersion.sh 
${project.version} ${generated.sources}/java/
+arg line=${basedir}/src/saveVersion.sh 
${project.version} ${generated.sources}/java /
 /exec
 /target
 /configuration
@@ -166,7 +165,7 @@
 /goals
   /pluginExecutionFilter
   action
-execute/
+execute /
   /action
 /pluginExecution
   /pluginExecutions

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492049r1=1492048r2=1492049view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 04:16:53 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492049r1=1492048r2=1492049view=diff

svn commit: r1492051 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 04:20:15 2013
New Revision: 1492051

URL: http://svn.apache.org/r1492051
Log:
Commit version w/ appended -hadoop1-SNAPSHOT

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 04:20:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 04:20:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 04:20:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 04:20:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 04:20:15 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492051r1=1492050r2=1492051view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 04:20:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492051r1=1492050r2=1492051view=diff

svn commit: r1492052 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 04:23:43 2013
New Revision: 1492052

URL: http://svn.apache.org/r1492052
Log:
[maven-release-plugin] prepare release hbase-0.95.1-hadoop1

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 04:23:43 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 04:23:43 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 04:23:43 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 04:23:43 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 04:23:43 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492052r1=1492051r2=1492052view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 04:23:43 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492052r1=1492051r2=1492052view=diff

svn commit: r1492053 - /hbase/tags/0.95.1-hadoop1.mvnlabeling2/

[stack]

Author: stack
Date: Wed Jun 12 04:39:33 2013
New Revision: 1492053

URL: http://svn.apache.org/r1492053
Log:
[maven-release-plugin]  copy for tag 0.95.1-hadoop1.mvnlabeling2

Added:
hbase/tags/0.95.1-hadoop1.mvnlabeling2/   (props changed)
  - copied from r1492052, hbase/tags/0.95.1mvn/

Propchange: hbase/tags/0.95.1-hadoop1.mvnlabeling2/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jun 12 04:39:33 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/0.95.1-hadoop1.mvnlabeling2/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 12 04:39:33 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1492054 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 04:39:38 2013
New Revision: 1492054

URL: http://svn.apache.org/r1492054
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 04:39:38 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 04:39:38 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 04:39:38 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 04:39:38 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 04:39:38 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492054r1=1492053r2=1492054view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 04:39:38 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492054r1=1492053r2=1492054view=diff

svn commit: r1492055 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 05:06:15 2013
New Revision: 1492055

URL: http://svn.apache.org/r1492055
Log:
Resetting version to -hadoop1-SNAPSHOT

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 05:06:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 05:06:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 05:06:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 05:06:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 05:06:15 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492055r1=1492054r2=1492055view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 05:06:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492055r1=1492054r2=1492055view=diff

svn commit: r1492056 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 05:09:15 2013
New Revision: 1492056

URL: http://svn.apache.org/r1492056
Log:
[maven-release-plugin] prepare release hbase-0.95.1-hadoop1

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 05:09:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 05:09:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 05:09:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 05:09:15 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 05:09:15 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492056r1=1492055r2=1492056view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 05:09:15 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop1/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492056r1=1492055r2=1492056view=diff

svn commit: r1492058 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 05:15:37 2013
New Revision: 1492058

URL: http://svn.apache.org/r1492058
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 05:15:37 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 05:15:37 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 05:15:37 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 05:15:37 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 05:15:37 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492058r1=1492057r2=1492058view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 05:15:37 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1/version
+version0.95.2-hadoop1-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492058r1=1492057r2=1492058view=diff

svn commit: r1492057 - /hbase/tags/hbase-0.95.1-hadoop1/

[stack]

Author: stack
Date: Wed Jun 12 05:15:32 2013
New Revision: 1492057

URL: http://svn.apache.org/r1492057
Log:
[maven-release-plugin]  copy for tag hbase-0.95.1-hadoop1

Added:
hbase/tags/hbase-0.95.1-hadoop1/   (props changed)
  - copied from r1492056, hbase/tags/0.95.1mvn/

Propchange: hbase/tags/hbase-0.95.1-hadoop1/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jun 12 05:15:32 2013
@@ -0,0 +1,8 @@
+.project
+.classpath
+build
+logs
+target
+*.iws
+*.iml
+*.ipr

Propchange: hbase/tags/hbase-0.95.1-hadoop1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 12 05:15:32 2013
@@ -0,0 +1,2 @@
+/hbase/branches/hbase-7290:1423552-1445868
+/hbase/branches/hbase-7290v2:1445869-1448498

svn commit: r1492059 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-hadoop2-compat/ hbase-it/ hbase-prefix-

[stack]

Author: stack
Date: Wed Jun 12 05:34:54 2013
New Revision: 1492059

URL: http://svn.apache.org/r1492059
Log:
Resetting version to -hadoop2-SNAPSHOT

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 05:34:54 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 05:34:54 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 05:34:54 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 05:34:54 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 05:34:54 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.2-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml?rev=1492059r1=1492058r2=1492059view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop2-compat/pom.xml Wed Jun 12 05:34:54 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop1-SNAPSHOT/version
+version0.95.1-hadoop2-SNAPSHOT/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org

svn commit: r1492061 - in /hbase/tags/0.95.1mvn: ./ hbase-assembly/ hbase-client/ hbase-common/ hbase-examples/ hbase-hadoop-compat/ hbase-hadoop1-compat/ hbase-it/ hbase-prefix-tree/ hbase-protocol/

[stack]

Author: stack
Date: Wed Jun 12 05:42:47 2013
New Revision: 1492061

URL: http://svn.apache.org/r1492061
Log:
Resetting version to -hadoop2-SNAPSHOT

Modified:
hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
hbase/tags/0.95.1mvn/hbase-client/pom.xml
hbase/tags/0.95.1mvn/hbase-common/pom.xml
hbase/tags/0.95.1mvn/hbase-examples/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
hbase/tags/0.95.1mvn/hbase-it/pom.xml
hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
hbase/tags/0.95.1mvn/hbase-protocol/pom.xml
hbase/tags/0.95.1mvn/hbase-server/pom.xml
hbase/tags/0.95.1mvn/pom.xml

Modified: hbase/tags/0.95.1mvn/hbase-assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-assembly/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
Binary files - no diff available.

Modified: hbase/tags/0.95.1mvn/hbase-client/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-client/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-client/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-client/pom.xml Wed Jun 12 05:42:47 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-common/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-common/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-common/pom.xml Wed Jun 12 05:42:47 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-examples/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-examples/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-examples/pom.xml Wed Jun 12 05:42:47 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
   /parent
   artifactIdhbase-examples/artifactId

Modified: hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop-compat/pom.xml Wed Jun 12 05:42:47 2013
@@ -23,7 +23,7 @@
 parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
 /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-hadoop1-compat/pom.xml Wed Jun 12 05:42:47 2013
@@ -21,7 +21,7 @@ limitations under the License.
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-it/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-it/pom.xml?rev=1492061r1=1492060r2=1492061view=diff
==
--- hbase/tags/0.95.1mvn/hbase-it/pom.xml (original)
+++ hbase/tags/0.95.1mvn/hbase-it/pom.xml Wed Jun 12 05:42:47 2013
@@ -23,7 +23,7 @@
   parent
 artifactIdhbase/artifactId
 groupIdorg.apache.hbase/groupId
-version0.95.1-hadoop2-SNAPSHOT/version
+version0.95.1-hadoop2/version
 relativePath../relativePath
   /parent
 

Modified: hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.95.1mvn/hbase-prefix-tree/pom.xml?rev=1492061r1=1492060r2=1492061view=diff