Author: todd
Date: Thu Sep 9 17:05:36 2010
New Revision: 995495
URL: http://svn.apache.org/viewvc?rev=995495&view=rev
Log:
HBASE-2975. DFSClient names in master and RS should be unique
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=995495&r1=995494&r2=995495&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 9 17:05:36 2010
@@ -515,6 +515,7 @@ Release 0.21.0 - Unreleased
(Guilherme Mauro Germoglio Barbosa via Stack)
HBASE-2973 NPE in LogCleaner
HBASE-2974 LoadBalancer ArithmeticException: / by zero
+ HBASE-2975 DFSClient names in master and RS should be unique
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=995495&r1=995494&r2=995495&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu
Sep 9 17:05:36 2010
@@ -204,7 +204,8 @@ implements HMasterInterface, HMasterRegi
// 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());
}
/*
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=995495&r1=995494&r2=995495&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Thu Sep 9 17:05:36 2010
@@ -691,7 +691,8 @@ public class HRegionServer implements HR
// 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
