fix merge conflicts

Author: gkanade

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

@@ -98,6 +98,8 @@ public abstract class ServerCall<T extends ServerRpcConnection> implements RpcCa
   // the rest of the bits are for WAL reference count. We can only call release if all of them are
   // zero. The reason why we can not use a general reference counting is that, we may call cleanup
   // multiple times in the current implementation. We should fix this in the future.
+  // The refCount here will start as 0x80000000 and increment with every WAL reference and decrement
+  // from WAL side on release
   private final AtomicInteger reference = new AtomicInteger(0x80000000);
 
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "NP_NULL_ON_SOME_PATH",
@@ -174,6 +176,9 @@ public void retainByWAL() {
   }
 
   public void releaseByWAL() {
+    // Here this method of decrementAndGet for releasing WAL reference count will work in both
+    // cases - i.e. highest bit (cleanup) 1 or 0. We will be decrementing a negative or positive
+    // value respectively in these 2 cases, but the logic will work the same way
     if (reference.decrementAndGet() == 0) {
       if (this.reqCleanup != null) {
         this.reqCleanup.run();

hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestFSHLogCorruptionWithMultiPutDueToDanglingByteBuffer.java

@@ -107,6 +107,7 @@ public static void setUp() throws Exception {
       SimpleRpcServer.class.getName());
     UTIL.getConfiguration().setInt(ByteBuffAllocator.MAX_BUFFER_COUNT_KEY, 1);
     UTIL.getConfiguration().setInt(ByteBuffAllocator.BUFFER_SIZE_KEY, 1024);
+    UTIL.getConfiguration().setInt(ByteBuffAllocator.MIN_ALLOCATE_SIZE_KEY, 500);
     UTIL.startMiniCluster(1);
     UTIL.createTable(TABLE_NAME, CF);
     UTIL.waitTableAvailable(TABLE_NAME);

hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALCorruptionWithMultiPutDueToDanglingByteBufferTestBase.java

@@ -63,8 +63,8 @@ public void test() throws Exception {
     ARRIVE = new CountDownLatch(1);
     RESUME = new CountDownLatch(1);
     try (Table table = UTIL.getConnection().getTable(TABLE_NAME)) {
-      LOG.info("Put totally 100 rows in batches of 4 with " + Durability.ASYNC_WAL + "...");
-      int batchSize = 4;
+      LOG.info("Put totally 100 rows in batches of 5 with " + Durability.ASYNC_WAL + "...");
+      int batchSize = 5;
       List<Put> puts = new ArrayList<>(batchSize);
       for (int i = 1; i <= 100; i++) {
         Put p = new Put(getBytes("row", i)).addColumn(CF, CQ, getBytes("value", i))