Skip to content

Commit

Permalink
Merge "Zoo node data just contains hostname so that restart of collec…
Browse files Browse the repository at this point in the history
…tor can be handled"
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Mar 8, 2016
2 parents d9cd4e0 + 9ccc1e3 commit d0f708b
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/zookeeper/zookeeper_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
//

#include <cerrno>
#include <boost/uuid/random_generator.hpp>
#include <boost/uuid/uuid_io.hpp>

#include <base/logging.h>

Expand Down Expand Up @@ -242,9 +240,7 @@ class ZookeeperLock::ZookeeperLockImpl {
clientImpl_(clientImpl),
path_(path),
is_acquired_(false) {
// Generate unique ID for data
boost::uuids::uuid ruuid(rgen_());
id_ = clientImpl_->Name() + "-" + to_string(ruuid);
id_ = clientImpl_->Name();
}

std::string Id() const {
Expand Down Expand Up @@ -354,7 +350,6 @@ class ZookeeperLock::ZookeeperLockImpl {
impl::ZookeeperClientImpl *clientImpl_;
std::string path_;
bool is_acquired_;
boost::uuids::random_generator rgen_;
std::string id_;
};

Expand Down

0 comments on commit d0f708b

Please sign in to comment.