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=1486120&r1=1486119&r2=1486120&view=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=1486120&r1=1486119&r2=1486120&view=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/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=1486120&r1=1486119&r2=1486120&view=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 Fri May 24 17:06:00 2013 @@ -914,7 +914,7 @@ public class HRegionServer implements Cl } //fsOk flag may be changed when closing regions throws exception. - if (this.fsOk) { + if (!this.killed && this.fsOk) { closeWAL(!abortRequested); }