From 6519b98ac3115c4442a2778f6ed7b39ce5cd3b83 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Sat, 3 Feb 2018 18:15:01 +0800 Subject: [PATCH] Revert "HBASE-19919 Tidying up logging" This reverts commit 40250f8c5f8efe3016f0c3300d9728b0ee2056c6. Wrong patch. Revert to fix compile error. --- .../apache/hadoop/hbase/net/TestAddress.java | 50 ------------------- .../hbase/regionserver/RSRpcServices.java.rej | 9 ---- .../ReplicationPeerConfigUpgrader.java.rej | 10 ---- 3 files changed, 69 deletions(-) delete mode 100644 hbase-common/src/test/java/org/apache/hadoop/hbase/net/TestAddress.java delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java.rej delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java.rej diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/net/TestAddress.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/net/TestAddress.java deleted file mode 100644 index 22c79403513..00000000000 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/net/TestAddress.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.net; - - -import org.apache.hadoop.hbase.HBaseClassTestRule; -import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.junit.Assert.assertEquals; - -@Category({ MiscTests.class, SmallTests.class }) -public class TestAddress { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestAddress.class); - - @Test - public void testGetHostWithoutDomain() { - assertEquals("a:123", - Address.fromParts("a.b.c", 123).toStringWithoutDomain()); - assertEquals("1:123", - Address.fromParts("1.b.c", 123).toStringWithoutDomain()); - assertEquals("123.456.789.1:123", - Address.fromParts("123.456.789.1", 123).toStringWithoutDomain()); - assertEquals("[2001:db8::1]:80", - Address.fromParts("[2001:db8::1]:", 80).toStringWithoutDomain()); - assertEquals("[2001:db8::1]:80", - Address.fromParts("[2001:db8::1]:", 80).toStringWithoutDomain()); - } -} diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java.rej b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java.rej deleted file mode 100644 index 3c7237c36b1..00000000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java (rejected hunks) -@@ -100,6 +100,7 @@ import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException; - import org.apache.hadoop.hbase.ipc.ServerRpcController; - import org.apache.hadoop.hbase.log.HBaseMarkers; - import org.apache.hadoop.hbase.master.MasterRpcServices; -+import org.apache.hadoop.hbase.net.Address; - import org.apache.hadoop.hbase.quotas.ActivePolicyEnforcement; - import org.apache.hadoop.hbase.quotas.OperationQuota; - import org.apache.hadoop.hbase.quotas.QuotaUtil; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java.rej b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java.rej deleted file mode 100644 index a9829ef3292..00000000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.java (rejected hunks) -@@ -100,7 +100,7 @@ public class ReplicationPeerConfigUpgrader extends ReplicationStateZKBase { - // We only need to copy data from tableCFs node to rpc Node the first time hmaster start. - if (rpc.getTableCFsMap() == null || rpc.getTableCFsMap().isEmpty()) { - // we copy TableCFs node into PeerNode -- LOG.info("copy tableCFs into peerNode:" + peerId); -+ LOG.info("Copy table ColumnFamilies into peer=" + peerId); - ReplicationProtos.TableCF[] tableCFs = - ReplicationPeerConfigUtil.parseTableCFs( - ZKUtil.getData(this.zookeeper, tableCFsNode));