Author: todd
Date: Thu Sep 9 17:12:28 2010
New Revision: 995499
URL: http://svn.apache.org/viewvc?rev=995499&view=rev
Log:
HBASE-2975. DFSClient names in master and RS should be unique
Modified:
hbase/branches/0.89.20100830/CHANGES.txt
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.89.20100830/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.89.20100830/CHANGES.txt?rev=995499&r1=995498&r2=995499&view=diff
==============================================================================
--- hbase/branches/0.89.20100830/CHANGES.txt (original)
+++ hbase/branches/0.89.20100830/CHANGES.txt Thu Sep 9 17:12:28 2010
@@ -491,6 +491,7 @@ Release 0.89.20100830 - Mon Aug 30 13:03
HBASE-2961 Deadlock when RS tries to RPC to itself inside SplitTransaction
HBASE-2967 Failed split: IOE 'File is Corrupt!' -- sync length not being
written out to SequenceFile
+ HBASE-2975 DFSClient names in master and RS should be unique
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified:
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=995499&r1=995498&r2=995499&view=diff
==============================================================================
---
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
(original)
+++
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Thu Sep 9 17:12:28 2010
@@ -201,7 +201,8 @@ public class HMaster extends Thread impl
// 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());
}
// Set filesystem to be that of this.rootdir else we get complaints about
Modified:
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=995499&r1=995498&r2=995499&view=diff
==============================================================================
---
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/branches/0.89.20100830/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Thu Sep 9 17:12:28 2010
@@ -733,7 +733,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
