diff --git hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 7001ee9..07373ff 100644 --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -275,6 +275,10 @@ public final class HConstants { * Use '.' as a special character to seperate the log files from table data */ public static final String HREGION_LOGDIR_NAME = ".logs"; + /** Name of the HDFS directory that contains the temporary rep logs + */ + public static final String REPLICATION_LOG_DIR = ".replogs"; + /** Used to construct the name of the splitlog directory for a region server */ public static final String SPLIT_LOGDIR_NAME = "splitlog"; @@ -805,7 +809,7 @@ public final class HConstants { Collections.unmodifiableList(Arrays.asList(new String[] { HREGION_LOGDIR_NAME, HREGION_OLDLOGDIR_NAME, CORRUPT_DIR_NAME, SPLIT_LOGDIR_NAME, HBCK_SIDELINEDIR_NAME, HFILE_ARCHIVE_DIRECTORY, SNAPSHOT_DIR_NAME, HBASE_TEMP_DIRECTORY, - OLD_SNAPSHOT_DIR_NAME })); + OLD_SNAPSHOT_DIR_NAME, REPLICATION_LOG_DIR })); /** Directories that are not HBase user table directories */ public static final List HBASE_NON_USER_TABLE_DIRS = diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java index 6f74ec5..4b4ac99 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java @@ -54,6 +54,8 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; +import static org.apache.hadoop.hbase.HConstants.REPLICATION_LOG_DIR; + /** * This class is responsible for replicating the edits coming * from another cluster. @@ -72,8 +74,7 @@ import org.apache.hadoop.hbase.util.Threads; public class ReplicationSink { private static final Log LOG = LogFactory.getLog(ReplicationSink.class); - // Name of the HDFS directory that contains the temporary rep logs - public static final String REPLICATION_LOG_DIR = ".replogs"; + private final Configuration conf; private final ExecutorService sharedThreadPool; private final HConnection sharedHtableCon;