commit 68d86510bfd09295a50e427d9f06f6fa7826a207 Author: Todd Lipcon Date: Thu Sep 9 01:30:34 2010 -0400 DFSClient names of HMaster and HRegionServer should be unique diff --git src/main/java/org/apache/hadoop/hbase/master/HMaster.java src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 7012abd..a2ae804 100644 --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -208,7 +208,8 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { // Hack! Maps DFSClient => Master for logs. HDFS made this // config param for task trackers, but we can piggyback off of it. if (this.conf.get("mapred.task.id") == null) { - this.conf.set("mapred.task.id", "hb_m_" + this.address.toString()); + this.conf.set("mapred.task.id", "hb_m_" + this.address.toString() + + "_" + System.currentTimeMillis()); } /* diff --git src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 5e140c0..317d58c 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -694,7 +694,8 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, // config param for task trackers, but we can piggyback off of it. if (this.conf.get("mapred.task.id") == null) { this.conf.set("mapred.task.id", - "hb_rs_" + this.serverInfo.getServerName()); + "hb_rs_" + this.serverInfo.getServerName() + "_" + + System.currentTimeMillis()); } // Master sent us hbase.rootdir to use. Should be fully qualified