svn commit: r1181339 - in /hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase: master/HMaster.java regionserver/HRegionServer.java

[ns...@apache.org]

Author: nspiegelberg
Date: Tue Oct 11 02:00:13 2011
New Revision: 1181339

URL: http://svn.apache.org/viewvc?rev=1181339&view=rev
Log:
HBASE-2862: Minor naming modifications per Open Source peer review

Modified:
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
    hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1181339&r1=1181338&r2=1181339&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Tue Oct 11 02:00:13 2011
@@ -202,7 +202,7 @@ 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", "HMaster_" + this.address.toString());
+      this.conf.set("mapred.task.id", "hb_m_" + this.address.toString());
     }
 
     // Set filesystem to be that of this.rootdir else we get complaints about

Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1181339&r1=1181338&r2=1181339&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Oct 11 02:00:13 2011
@@ -733,7 +733,7 @@ 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",
-            "HRegionServer_" + this.serverInfo.getServerAddress().toString());
+            "hb_rs_" + this.serverInfo.getServerName());
       }
 
       // Master sent us hbase.rootdir to use. Should be fully qualified
@@ -2543,4 +2543,4 @@ public class HRegionServer implements HR
         HRegionServer.class);
     doMain(args, regionServerClass);
   }
-}
\ No newline at end of file
+}