Merge remote branch 'upstream/li-r1044' into li-r1044-admin

voldemort · Nov 3, 2010 · 718c1fb · 718c1fb
2 parents 0fa576d + f9d9e55
commit 718c1fb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java b/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
@@ -37,6 +37,7 @@
 import voldemort.store.StorageEngine;
 import voldemort.store.readonly.FileFetcher;
 import voldemort.store.readonly.ReadOnlyStorageEngine;
+import voldemort.store.readonly.ReadOnlyUtils;
 import voldemort.utils.ByteArray;
 import voldemort.utils.Props;
 import voldemort.utils.ReflectUtils;
@@ -186,7 +187,17 @@ private void doFetch(HttpServletRequest req, HttpServletResponse resp) throws IO
 
         long pushVersion;
         if(pushVersionString == null) {
-            pushVersion = store.getCurrentVersionId() + 1;
+            // Find the max version
+            long maxVersion;
+            File[] storeDirList = ReadOnlyUtils.getVersionDirs(new File(store.getStoreDirPath()));
+            if(storeDirList == null || storeDirList.length == 0) {
+                throw new ServletException("Push version required since no version folders exist");
+            } else {
+                maxVersion = ReadOnlyUtils.getVersionId(ReadOnlyUtils.findKthVersionedDir(storeDirList,
+                                                                                          storeDirList.length - 1,
+                                                                                          storeDirList.length - 1)[0]);
+            }
+            pushVersion = maxVersion + 1;
         } else {
             pushVersion = Long.parseLong(pushVersionString);
             if(pushVersion <= store.getCurrentVersionId())

diff --git a/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java b/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
@@ -513,7 +513,17 @@ public VAdminProto.AsyncOperationStatusResponse handleFetchStore(VAdminProto.Fet
                                                  + ") should be greater than current version "
                                                  + store.getCurrentVersionId());
             } else {
-                pushVersion = store.getCurrentVersionId() + 1;
+                // Find the max version
+                long maxVersion;
+                File[] storeDirList = ReadOnlyUtils.getVersionDirs(new File(store.getStoreDirPath()));
+                if(storeDirList == null || storeDirList.length == 0) {
+                    throw new VoldemortException("Push version required since no version folders exist");
+                } else {
+                    maxVersion = ReadOnlyUtils.getVersionId(ReadOnlyUtils.findKthVersionedDir(storeDirList,
+                                                                                              storeDirList.length - 1,
+                                                                                              storeDirList.length - 1)[0]);
+                }
+                pushVersion = maxVersion + 1;
             }
 
             asyncService.submitOperation(requestId, new AsyncOperation(requestId, "Fetch store") {