From 020e50dc26d85528f7627d59bcc1d55831a11932 Mon Sep 17 00:00:00 2001
From: Giorgos Korfiatis <gkorf@grnet.gr>
Date: Wed, 6 May 2015 17:03:49 +0300
Subject: [PATCH] cleanup probing
---
agkyra/agkyra/syncer/localfs_client.py | 4 +---
agkyra/agkyra/syncer/pithos_client.py | 4 +---
agkyra/agkyra/syncer/syncer.py | 3 +--
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/agkyra/agkyra/syncer/localfs_client.py b/agkyra/agkyra/syncer/localfs_client.py
index 8379550..b12fcdd 100644
--- a/agkyra/agkyra/syncer/localfs_client.py
+++ b/agkyra/agkyra/syncer/localfs_client.py
@@ -505,9 +505,7 @@ class LocalfsFileClient(FileClient):
final_part = parts[-1]
return exclude_pattern.match(final_part)
- def start_probing_file(self, objname, old_state, ref_state,
- assumed_info=None,
- callback=None):
+ def start_probing_file(self, objname, old_state, ref_state, callback=None):
cached_info = self.probe_candidates.pop(objname)
if self.exclude_file(objname):
logger.warning("Ignoring probe archive: %s, object: %s" %
diff --git a/agkyra/agkyra/syncer/pithos_client.py b/agkyra/agkyra/syncer/pithos_client.py
index 24d1c0f..42bbf14 100644
--- a/agkyra/agkyra/syncer/pithos_client.py
+++ b/agkyra/agkyra/syncer/pithos_client.py
@@ -325,9 +325,7 @@ class PithosFileClient(FileClient):
PITHOS_TYPE: p_type,
}
- def start_probing_file(self, objname, old_state, ref_state,
- assumed_info=None,
- callback=None):
+ def start_probing_file(self, objname, old_state, ref_state, callback=None):
info = old_state.info
cached_info = self.probe_candidates.pop(objname)
if exclude_pattern.match(objname):
diff --git a/agkyra/agkyra/syncer/syncer.py b/agkyra/agkyra/syncer/syncer.py
index d5ebbe0..efcedfc 100644
--- a/agkyra/agkyra/syncer/syncer.py
+++ b/agkyra/agkyra/syncer/syncer.py
@@ -97,7 +97,7 @@ class FileSyncer(object):
return self.messager.get(block=block)
@transaction()
- def probe_file(self, archive, objname, assumed_info=None):
+ def probe_file(self, archive, objname):
logger.info("Probing archive: %s, object: '%s'" % (archive, objname))
db = self.get_db()
client = self.clients[archive]
@@ -116,7 +116,6 @@ class FileSyncer(object):
"object: '%s'" % (archive, objname))
return
client.start_probing_file(objname, db_state, ref_state,
- assumed_info=assumed_info,
callback=self.update_file_state)
@transaction()
--
GitLab