summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Coles <alistair.coles@hpe.com>2016-03-22 11:10:41 +0000
committerAlistair Coles <alistair.coles@hpe.com>2016-03-22 11:10:41 +0000
commit88b575895750c2c00f75a6193cc31bc930e980fd (patch)
treef43c29c1c68ec7d30af7346504b15a1d8c0c2a1c
parent0ad1b0cca1f2538ac8fe3ef27d9e06c102157000 (diff)
downloadswift-88b575895750c2c00f75a6193cc31bc930e980fd.tar.gz
Remove unused code from container sync
Change-Id: Ia44138aadcd30c474f744a9c552220e18302ecc6
-rw-r--r--swift/container/sync.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/swift/container/sync.py b/swift/container/sync.py
index 1c2260e0f..2ade27a5a 100644
--- a/swift/container/sync.py
+++ b/swift/container/sync.py
@@ -39,7 +39,6 @@ from swift.common.utils import (
whataremyips, Timestamp, decode_timestamps)
from swift.common.daemon import Daemon
from swift.common.http import HTTP_UNAUTHORIZED, HTTP_NOT_FOUND
-from swift.common.storage_policy import POLICIES
from swift.common.wsgi import ConfigString
@@ -238,15 +237,6 @@ class ContainerSync(Daemon):
_('Unable to load internal client from config: %r (%s)') %
(internal_client_conf_path, err))
- def get_object_ring(self, policy_idx):
- """
- Get the ring object to use based on its policy.
-
- :policy_idx: policy index as defined in swift.conf
- :returns: appropriate ring object
- """
- return POLICIES.get_object_ring(policy_idx, self.swift_dir)
-
def run_forever(self, *args, **kwargs):
"""
Runs container sync scans until stopped.
@@ -364,8 +354,6 @@ class ContainerSync(Daemon):
row = rows[0]
if row['ROWID'] > sync_point1:
break
- key = hash_path(info['account'], info['container'],
- row['name'], raw_digest=True)
# This node will only initially sync out one third of the
# objects (if 3 replicas, 1/4 if 4, etc.) and will skip
# problematic rows as needed in case of faults.