From d6507aa771cef226e879ffddaec4b9f85d758884 Mon Sep 17 00:00:00 2001
From: Matthew V <matthewv@basho.com>
Date: Wed, 15 Feb 2017 13:50:42 -0500
Subject: [PATCH] merge mv-hot-backup2 bug fix to 2.0

---
 BASHO_RELEASES      | 7 +++++++
 db/filename.cc      | 9 +++++++--
 db/filename_test.cc | 6 ++++++
 db/version_set.h    | 2 +-
 leveldb_ee          | 2 +-
 tools/sst_scan.cc   | 2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/BASHO_RELEASES b/BASHO_RELEASES
index acf4b31f..56726135 100644
--- 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
index 483ebb8a..bb90e656 100644
--- a/db/filename.cc
+++ b/db/filename.cc
@@ -281,7 +281,12 @@ 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("/");
@@ -289,7 +294,7 @@ MakeTieredDbname(
 
         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
index f844d026..a075f9b7 100644
--- 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
index 2e08746c..a8f93155 100644
--- 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
index 47ee57b9..1d13c28c 160000
--- a/leveldb_ee
+++ b/leveldb_ee
@@ -1 +1 @@
-Subproject commit 47ee57b9ef026557098b1e637ab475d709a8dbff
+Subproject commit 1d13c28cb198770e03f805c7dd32d6a58260c1e2
diff --git a/tools/sst_scan.cc b/tools/sst_scan.cc
index 07ff5dd4..13509d92 100644
--- 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