Author: stack
Date: Fri Jul 26 23:54:20 2013
New Revision: 1507527
URL: http://svn.apache.org/r1507527
Log:
HBASE-8439 [replication] Remove ReplicationZookeeper class; ADDENDDUM
Modified:
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
Modified:
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java?rev=1507527&r1=1507526&r2=1507527&view=diff
==============================================================================
---
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java
(original)
+++
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationTracker.java
Fri Jul 26 23:54:20 2013
@@ -43,7 +43,7 @@ public interface ReplicationTracker {
/**
* Returns a list of other live region servers in the cluster.
- * @return
+ * @return List of region servers.
*/
public List<String> getListOfRegionServers();
-}
\ No newline at end of file
+}
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java?rev=1507527&r1=1507526&r2=1507527&view=diff
==============================================================================
---
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java
(original)
+++
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java
Fri Jul 26 23:54:20 2013
@@ -40,8 +40,11 @@ public interface ReplicationSourceInterf
* @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,
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java?rev=1507527&r1=1507526&r2=1507527&view=diff
==============================================================================
---
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
(original)
+++
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
Fri Jul 26 23:54:20 2013
@@ -60,7 +60,7 @@ import com.google.common.util.concurrent
* 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 @@ public class ReplicationSourceManager im
/**
* 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 @@ public class ReplicationSourceManager im
* @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);
