merge mv-hot-backup2 bug fix to 2.0

basho · Feb 15, 2017 · d6507aa · d6507aa
1 parent 69a8fc1
commit d6507aa
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/BASHO_RELEASES b/BASHO_RELEASES
@@ -1,3 +1,10 @@
+github.com tag 2.0.34 - February 15, 2017
+-----------------------------------------
+mv-hot-backup2:  - correct MakeTieredDbname() within db/filename.cc
+                   for case where dbname input is blank and fast/slow
+                   already populated in options.  Corrects issue
+                   with hot backup in non-tiered storage situations
+
 github.com tag 2.0.33 - November 21, 2016
 -----------------------------------------
 mv-bucket-expiry:  - partial branch to enable X-Riak-Meta-Expiry-Base-Seconds

diff --git a/db/filename.cc b/db/filename.cc
@@ -281,15 +281,20 @@ MakeTieredDbname(
     const std::string & dbname,    // input ... original dbname from DBImpl constructor
     Options & options)             // input/output ... writable Options, tiered values changed
 {
-    if (0<(int)options.tiered_slow_level && (int)options.tiered_slow_level<config::kNumLevels
+    // case for "", used with internal calls to DestroyDB
+    if (0==dbname.size() && 0!=options.tiered_fast_prefix.size())
+    {
+        // do NOTHING ... options already initialized
+    }   // if
+    else if (0<(int)options.tiered_slow_level && (int)options.tiered_slow_level<config::kNumLevels
         && 0!=options.tiered_fast_prefix.size() && 0!=options.tiered_slow_prefix.size())
     {
         options.tiered_fast_prefix.append("/");
         options.tiered_fast_prefix.append(dbname);
 
         options.tiered_slow_prefix.append("/");
         options.tiered_slow_prefix.append(dbname);
-    }
+    }   // else if
     else
     {
         options.tiered_slow_level=0;

diff --git a/db/filename_test.cc b/db/filename_test.cc
@@ -178,6 +178,12 @@ TEST(FileNameTest, Construction) {
   ASSERT_EQ("//mnt/fast/riak/data/leveldb", options.tiered_fast_prefix);
   ASSERT_EQ("//mnt/slow/riak/data/leveldb", options.tiered_slow_prefix);
 
+  // special case with no dbname given, should have no changes
+  fname=MakeTieredDbname("", options);
+  ASSERT_EQ("//mnt/fast/riak/data/leveldb", fname);
+  ASSERT_EQ("//mnt/fast/riak/data/leveldb", options.tiered_fast_prefix);
+  ASSERT_EQ("//mnt/slow/riak/data/leveldb", options.tiered_slow_prefix);
+
 }
 
 }  // namespace leveldb

diff --git a/db/version_set.h b/db/version_set.h
@@ -166,7 +166,7 @@ class Version {
   {
   }
 
-  ~Version();
+  virtual ~Version();
 
 private:
   // No copying allowed

diff --git a/leveldb_ee b/leveldb_ee
diff --git a/tools/sst_scan.cc b/tools/sst_scan.cc
@@ -288,7 +288,7 @@ main(
 
                                     if (value_dump)
                                     {
-                                        uint64_t mod_time;
+//                                        uint64_t mod_time;
 
                                         printf("  %s\n", HexString(it2->value()).c_str());
 #if 0