Merge pull request #942 from 00k/master

issue=#941 bugfix of cookie file name

Author: xupeilin

src/sdk/sdk_zk.cc

@@ -54,6 +54,21 @@ std::string ClusterFinder::RootTableAddr(bool update) {
     return _root_table_addr;
 }
 
+std::string ClusterFinder::ClusterId() {
+    std::string name = Name();
+    std::string authority = Authority();
+    std::string path = Path();
+    if (name.empty() || authority.empty() || path.empty()) {
+        LOG(FATAL) << "cluster name/authority/path must be non-empty";
+    }
+    std::string cluster_id = name + "://" + authority;
+    if (path[0] != '/') {
+        cluster_id += "/";
+    }
+    cluster_id += path;
+    return cluster_id;
+}
+
 ZkClusterFinder::ZkClusterFinder(const std::string& zk_root_path,
                                  const std::string& zk_addr_list)
     : _zk_root_path(zk_root_path), _zk_addr_list(zk_addr_list) {

src/sdk/sdk_zk.h

@@ -19,9 +19,13 @@ class ClusterFinder
     virtual ~ClusterFinder() {}
     std::string MasterAddr(bool update = false);
     std::string RootTableAddr(bool update = false);
+    std::string ClusterId(); // cluster URI: <scheme>://<authority>/<path>
 
 private:
     virtual bool ReadNode(const std::string& path, std::string* value) = 0;
+    virtual std::string Name() = 0;
+    virtual std::string Authority() = 0;
+    virtual std::string Path() = 0;
 
     mutable Mutex _mutex;
     std::string _master_addr;
@@ -33,6 +37,9 @@ class ZkClusterFinder : public ClusterFinder {
     ZkClusterFinder(const std::string& zk_root_path, const std::string& zk_addr_list);
 private:
     virtual bool ReadNode(const std::string& path, std::string* value);
+    virtual std::string Name() { return "zk"; };
+    virtual std::string Authority() { return _zk_addr_list; }
+    virtual std::string Path() { return _zk_root_path; }
     std::string _zk_root_path;
     std::string _zk_addr_list;
 };
@@ -42,6 +49,9 @@ class InsClusterFinder : public ClusterFinder {
     InsClusterFinder(const std::string& ins_root_path, const std::string& ins_addr_list);
 private:
     virtual bool ReadNode(const std::string& path, std::string* value);
+    virtual std::string Name() { return "ins"; };
+    virtual std::string Authority() { return _ins_addr_list; }
+    virtual std::string Path() { return _ins_root_path; }
     std::string _ins_root_path;
     std::string _ins_addr_list;
 };
@@ -51,6 +61,9 @@ class FakeZkClusterFinder : public ClusterFinder {
     FakeZkClusterFinder(const std::string& fake_zk_path_prefix);
 private:
     virtual bool ReadNode(const std::string& path, std::string* value);
+    virtual std::string Name() { return "fakezk"; };
+    virtual std::string Authority() { return "localhost"; }
+    virtual std::string Path() { return _fake_zk_path_prefix; }
     std::string _fake_zk_path_prefix;
 };
 

src/sdk/table_impl.cc

@@ -461,6 +461,7 @@ bool TableImpl::OpenInternal(ErrorCode* err) {
     if (FLAGS_tera_sdk_perf_counter_enabled) {
         DumpPerfCounterLogDelay();
     }
+    LOG(INFO) << "open table " << _name << " at cluster " << _cluster->ClusterId();
     return true;
 }
 
@@ -1861,7 +1862,7 @@ bool TableImpl::RestoreCookie() {
 
 std::string TableImpl::GetCookieFilePathName(void) {
     return FLAGS_tera_sdk_cookie_path + "/"
-        + GetCookieFileName(_name, _zk_addr_list, _zk_root_path, _create_time);
+        + GetCookieFileName(_name, _cluster->ClusterId(), _create_time);
 }
 
 std::string TableImpl::GetCookieLockFilePathName(void) {
@@ -1902,12 +1903,10 @@ void TableImpl::EnableCookieUpdateTimer() {
 }
 
 std::string TableImpl::GetCookieFileName(const std::string& tablename,
-                                         const std::string& zk_addr,
-                                         const std::string& zk_path,
+                                         const std::string& cluster_id,
                                          int64_t create_time) {
     uint32_t hash = 0;
-    if (GetHashNumber(zk_addr, hash, &hash) != 0
-        || GetHashNumber(zk_path, hash, &hash) != 0) {
+    if (GetHashNumber(cluster_id, hash, &hash) != 0) {
         LOG(FATAL) << "invalid arguments";
     }
     char hash_str[9] = {'\0'};

src/sdk/table_impl.h

@@ -363,8 +363,7 @@ class TableImpl : public Table {
     void DumpCookie();
     void DoDumpCookie();
     std::string GetCookieFileName(const std::string& tablename,
-                                  const std::string& zk_addr,
-                                  const std::string& zk_path,
+                                  const std::string& cluster_id,
                                   int64_t create_time);
     std::string GetCookieFilePathName();
     std::string GetCookieLockFilePathName();
@@ -429,9 +428,6 @@ class TableImpl : public Table {
     master::MasterClient* _master_client;
     tabletnode::TabletNodeClient* _tabletnode_client;
 
-    std::string _zk_root_path;
-    std::string _zk_addr_list;
-
     ThreadPool* _thread_pool;
     mutable Mutex _delay_task_id_mutex;
     std::set<int64_t> _delay_task_ids;