Skip to content

[HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 3 commits into from
Aug 21, 2019
Merged

[HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. #499

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6db4b16
[HBASE-22601] Misconfigured addition of peers leads to cluster shutdown.
Aug 15, 2019
c9c41ee
[HBASE-22601] Addresing test failures.
Aug 17, 2019
c5b7f7e
[HBASE-22601] Addresing review comments.
Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...ver/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,15 @@ private void initialize() {
}
}

if (peerClusterId == null) {
Copy link
Contributor

@Apache9 Apache9 Aug 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think here we just need to add the same check like above?

    if (!this.isSourceActive()) {
      return;
    }

Copy link
Contributor Author

@shahrs87 shahrs87 Aug 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this makes more sense. Thanks for the idea.

// In some cases, it is possible that peerClusterId is null because it couldn't read
// peer cluster id from zookeeper. One case this might happen is because 2 clusters don't
// have kerberos trust setup.
this.terminate("Peer ClusterId returned is null", null, false);
this.manager.removeSource(this);
return;
}

// In rare case, zookeeper setting may be messed up. That leads to the incorrect
// peerClusterId value, which is the same as the source clusterId
if (clusterId.equals(peerClusterId) && !replicationEndpoint.canReplicateToSameCluster()) {
Expand Down
6 changes: 4 additions & 2 deletions .../main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,10 @@ public void refreshSources(String peerId) throws IOException {
LOG.info("Terminate replication source for " + toRemove.getPeerId());
toRemove.terminate(terminateMessage);
}
for (NavigableSet<String> walsByGroup : walsById.get(peerId).values()) {
walsByGroup.forEach(wal -> src.enqueueLog(new Path(this.logDir, wal)));
if (walsById.get(peerId) != null) {
Copy link
Contributor

@Apache9 Apache9 Aug 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And is this possible? In the addSource method, we will always put a Map into the walsByGroup for the corresponding peerId. Notice that the code for branch-2 have been changed a lot from branch-1 so...

for (NavigableSet<String> walsByGroup : walsById.get(peerId).values()) {
walsByGroup.forEach(wal -> src.enqueueLog(new Path(this.logDir, wal)));
}
}
}
LOG.info("Startup replication source for " + src.getPeerId());
Expand Down