Index: hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java (revision 1507498) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java (working copy) @@ -43,7 +43,7 @@ /** * Returns a list of other live region servers in the cluster. - * @return + * @return List of region servers. */ public List getListOfRegionServers(); -} \ No newline at end of file +} Index: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java (revision 1507498) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java (working copy) @@ -40,8 +40,11 @@ * @param conf the configuration to use * @param fs the file system to use * @param manager the manager to use + * @param replicationQueues + * @param replicationPeers * @param stopper the stopper object for this region server - * @param peerClusterId the id of the peer cluster + * @param peerClusterZnode + * @param clusterId * @throws IOException */ public void init(final Configuration conf, final FileSystem fs, Index: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (revision 1507498) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java (working copy) @@ -60,7 +60,7 @@ * When a region server dies, this class uses a watcher to get notified and it * tries to grab a lock in order to transfer all the queues in a local * old source. - * + * * This class implements the ReplicationListener interface so that it can track changes in * replication state. */ @@ -99,13 +99,15 @@ /** * Creates a replication manager and sets the watch on all the other registered region servers - * @param zkHelper the zk helper for replication * @param replicationQueues the interface for manipulating replication queues + * @param replicationPeers + * @param replicationTracker * @param conf the configuration to use * @param stopper the stopper object for this region server * @param fs the file system to use * @param logDir the directory that contains all hlog directories of live RSs * @param oldLogDir the directory where old logs are archived + * @param clusterId */ public ReplicationSourceManager(final ReplicationQueues replicationQueues, final ReplicationPeers replicationPeers, final ReplicationTracker replicationTracker, @@ -151,7 +153,7 @@ * @param queueRecovered indicates if this queue comes from another region server * @param holdLogInZK if true then the log is retained in ZK */ - public void logPositionAndCleanOldLogs(Path log, String id, long position, + public void logPositionAndCleanOldLogs(Path log, String id, long position, boolean queueRecovered, boolean holdLogInZK) { String fileName = log.getName(); this.replicationQueues.setLogPosition(id, fileName, position);