summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2017-11-09 11:44:46 +0100
committerGitHub <noreply@github.com>2017-11-09 11:44:46 +0100
commitd4bdaff4b13a7ac51f8970ffd1dfc31f59ca8ce5 (patch)
treebf736c4d5476b39275448486d94d07a8778451fa
parentb8a4409e3f8693bf9445d23ac240a9d105371692 (diff)
parentc0659e1f5cd3fbdc18f046a25f8ad5fcdae7b7cd (diff)
Merge pull request #4054 from vespa-engine/toregge/remove-dead-code-in-clusterinformation
Remove dead code in distributor cluster information.
-rw-r--r--storage/src/vespa/storage/distributor/clusterinformation.cpp15
-rw-r--r--storage/src/vespa/storage/distributor/clusterinformation.h2
2 files changed, 0 insertions, 17 deletions
diff --git a/storage/src/vespa/storage/distributor/clusterinformation.cpp b/storage/src/vespa/storage/distributor/clusterinformation.cpp
index 8e956a1cf61..2e22d7db51d 100644
--- a/storage/src/vespa/storage/distributor/clusterinformation.cpp
+++ b/storage/src/vespa/storage/distributor/clusterinformation.cpp
@@ -7,21 +7,6 @@
namespace storage::distributor {
bool
-ClusterInformation::ownsBucket(const document::BucketId& bucketId) const
-{
- try {
- uint16_t distributor(getDistribution().getIdealDistributorNode(
- getClusterState(), bucketId));
-
- return (getDistributorIndex() == distributor);
- } catch (lib::TooFewBucketBitsInUseException& e) {
- return false;
- } catch (lib::NoDistributorsAvailableException& e) {
- return false;
- }
-}
-
-bool
ClusterInformation::nodeInSameGroupAsSelf(uint16_t otherNode) const
{
return (getDistribution().getNodeGraph().getGroupForNode(otherNode)
diff --git a/storage/src/vespa/storage/distributor/clusterinformation.h b/storage/src/vespa/storage/distributor/clusterinformation.h
index 4494b137f89..8b416e26147 100644
--- a/storage/src/vespa/storage/distributor/clusterinformation.h
+++ b/storage/src/vespa/storage/distributor/clusterinformation.h
@@ -32,8 +32,6 @@ public:
virtual const char* getStorageUpStates() const = 0;
- bool ownsBucket(const document::BucketId& bucketId) const;
-
bool nodeInSameGroupAsSelf(uint16_t otherNode) const;
vespalib::string getDistributionHash() const;