diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-13 14:02:43 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-09-14 09:16:52 +0000 |
| commit | 5fd50504380a45396890e99fa3412ff5f5172ff9 (patch) | |
| tree | 7583968ac272c531566397a646e2841b9e3122a8 /filedistribution/src | |
| parent | de769896fbfae460967f89b51d65c3045f993c7a (diff) | |
Do not start another thread waiting for a bug.
Diffstat (limited to 'filedistribution/src')
| -rw-r--r-- | filedistribution/src/vespa/filedistribution/model/zkfacade.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp index 82e06c48386..def419c78be 100644 --- a/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp +++ b/filedistribution/src/vespa/filedistribution/model/zkfacade.cpp @@ -262,14 +262,8 @@ ZKFacade::ZKFacade(const std::string& zkservers, ZKFacade::~ZKFacade() { disableRetries(); _watchersEnabled = false; - - boost::thread shutdownCaller(zookeeper_close, _zhandle); - if (shutdownCaller.timed_join(boost::posix_time::seconds(120))) { - LOGFWD(debug, "Zookeeper connection closed successfully."); - } else { - LOGFWD(info, "Timed out waiting for the zookeeper connection to shut down."); - abort(); - } + zookeeper_close(_zhandle); + LOGFWD(debug, "Zookeeper connection closed successfully."); } const std::string |