Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HBASE-19687 Move the logic in ReplicationZKNodeCleaner to Replication…
…Checker and remove ReplicationZKNodeCleanerChore
- Loading branch information
Showing
13 changed files
with
259 additions
and
459 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /** | ||
| * 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.replication; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hbase.CompoundConfiguration; | ||
| import org.apache.hadoop.hbase.HBaseConfiguration; | ||
| import org.apache.hadoop.hbase.ServerName; | ||
| import org.apache.yetus.audience.InterfaceAudience; | ||
|
|
||
| /** | ||
| * Helper class for replication. | ||
| */ | ||
| @InterfaceAudience.Private | ||
| public final class ReplicationUtils { | ||
|
|
||
| private ReplicationUtils() { | ||
| } | ||
|
|
||
| public static Configuration getPeerClusterConfiguration(ReplicationPeerConfig peerConfig, | ||
| Configuration baseConf) throws ReplicationException { | ||
| Configuration otherConf; | ||
| try { | ||
| otherConf = HBaseConfiguration.createClusterConf(baseConf, peerConfig.getClusterKey()); | ||
| } catch (IOException e) { | ||
| throw new ReplicationException("Can't get peer configuration for peer " + peerConfig, e); | ||
| } | ||
|
|
||
| if (!peerConfig.getConfiguration().isEmpty()) { | ||
| CompoundConfiguration compound = new CompoundConfiguration(); | ||
| compound.add(otherConf); | ||
| compound.addStringMap(peerConfig.getConfiguration()); | ||
| return compound; | ||
| } | ||
|
|
||
| return otherConf; | ||
| } | ||
|
|
||
| public static void removeAllQueues(ReplicationQueueStorage queueStorage, String peerId) | ||
| throws ReplicationException { | ||
| for (ServerName replicator : queueStorage.getListOfReplicators()) { | ||
| List<String> queueIds = queueStorage.getAllQueues(replicator); | ||
| for (String queueId : queueIds) { | ||
| ReplicationQueueInfo queueInfo = new ReplicationQueueInfo(queueId); | ||
| if (queueInfo.getPeerId().equals(peerId)) { | ||
| queueStorage.removeQueue(replicator, queueId); | ||
| } | ||
| } | ||
| queueStorage.removeReplicatorIfQueueIsEmpty(replicator); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
192 changes: 0 additions & 192 deletions
192
...server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.