From c70e4fa9841998e92511133a9032e461bc7039eb Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 1 May 2008 06:05:58 +0000
Subject: [PATCH] HBASE-609  Master doesn't see regionserver edits because of
 clock skew

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@652436 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java     | 6 +++---
 src/java/org/apache/hadoop/hbase/master/BaseScanner.java    | 2 +-
 .../apache/hadoop/hbase/master/ProcessServerShutdown.java   | 4 ++--
 src/java/org/apache/hadoop/hbase/master/TableOperation.java | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4fc512c33db..95eb7282747 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,7 @@ Hbase Change Log
    HBASE-604   Don't allow CLASSPATH from environment pollute the hbase CLASSPATH
    HBASE-608   HRegionServer::getThisIP() checks hadoop config var for dns interface name
                (Jim R. Wilson via Stack)
+   HBASE-609   Master doesn't see regionserver edits because of clock skew
 
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows
diff --git a/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index fdd2e8890ab..89144ff5444 100644
--- a/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -198,7 +198,7 @@ public class HBaseAdmin implements HConstants {
       try {
         scannerId =
           server.openScanner(firstMetaServer.getRegionInfo().getRegionName(),
-            COL_REGIONINFO_ARRAY, tableName, System.currentTimeMillis(), null);
+            COL_REGIONINFO_ARRAY, tableName, HConstants.LATEST_TIMESTAMP, null);
         RowResult values = server.next(scannerId);
         if (values == null || values.size() == 0) {
           break;
@@ -278,7 +278,7 @@ public class HBaseAdmin implements HConstants {
       try {
         scannerId =
           server.openScanner(firstMetaServer.getRegionInfo().getRegionName(),
-            COL_REGIONINFO_ARRAY, tableName, System.currentTimeMillis(), null);
+            COL_REGIONINFO_ARRAY, tableName, HConstants.LATEST_TIMESTAMP, null);
         boolean isenabled = false;
         
         while (true) {
@@ -378,7 +378,7 @@ public class HBaseAdmin implements HConstants {
       try {
         scannerId =
           server.openScanner(firstMetaServer.getRegionInfo().getRegionName(),
-            COL_REGIONINFO_ARRAY, tableName, System.currentTimeMillis(), null);
+            COL_REGIONINFO_ARRAY, tableName, HConstants.LATEST_TIMESTAMP, null);
         
         boolean disabled = false;
         while (true) {
diff --git a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
index dcdced9f2a3..62e1ec40b22 100644
--- a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
+++ b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
@@ -158,7 +158,7 @@ abstract class BaseScanner extends Chore implements HConstants {
       regionServer = master.connection.getHRegionConnection(region.getServer());
       scannerId =
         regionServer.openScanner(region.getRegionName(), COLUMN_FAMILY_ARRAY,
-            EMPTY_START_ROW, System.currentTimeMillis(), null);
+            EMPTY_START_ROW, HConstants.LATEST_TIMESTAMP, null);
 
       int numberOfRegionsFound = 0;
       while (true) {
diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
index d53876cf771..5a4b713b401 100644
--- a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
+++ b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
@@ -218,7 +218,7 @@ class ProcessServerShutdown extends RegionServerOperation {
       }
       long scannerId = server.openScanner(
           HRegionInfo.rootRegionInfo.getRegionName(), COLUMN_FAMILY_ARRAY,
-          EMPTY_START_ROW, System.currentTimeMillis(), null);
+          EMPTY_START_ROW, HConstants.LATEST_TIMESTAMP, null);
       scanMetaRegion(server, scannerId,
           HRegionInfo.rootRegionInfo.getRegionName());
       return true;
@@ -238,7 +238,7 @@ class ProcessServerShutdown extends RegionServerOperation {
       }
       long scannerId =
         server.openScanner(m.getRegionName(), COLUMN_FAMILY_ARRAY,
-        EMPTY_START_ROW, System.currentTimeMillis(), null);
+        EMPTY_START_ROW, HConstants.LATEST_TIMESTAMP, null);
 
         scanMetaRegion(server, scannerId, m.getRegionName());
       return true;
diff --git a/src/java/org/apache/hadoop/hbase/master/TableOperation.java b/src/java/org/apache/hadoop/hbase/master/TableOperation.java
index add8cab35ec..d2f932e43d4 100644
--- a/src/java/org/apache/hadoop/hbase/master/TableOperation.java
+++ b/src/java/org/apache/hadoop/hbase/master/TableOperation.java
@@ -92,7 +92,7 @@ abstract class TableOperation implements HConstants {
 
       // Open a scanner on the meta region
       long scannerId = server.openScanner(m.getRegionName(),
-          COLUMN_FAMILY_ARRAY, tableName, System.currentTimeMillis(), null);
+          COLUMN_FAMILY_ARRAY, tableName, HConstants.LATEST_TIMESTAMP, null);
 
       List<Text> emptyRows = new ArrayList<Text>();
       try {