From da54d3bbd50bb4ccf5e97ad9975d846ac6d2da45 Mon Sep 17 00:00:00 2001
From: Giorgos Korfiatis <gkorf@grnet.gr>
Date: Thu, 30 Apr 2015 14:48:59 +0300
Subject: [PATCH] add some more log
---
agkyra/agkyra/syncer/localfs_client.py | 4 ++++
agkyra/agkyra/syncer/messaging.py | 6 ++++--
agkyra/agkyra/syncer/pithos_client.py | 4 +++-
agkyra/agkyra/syncer/syncer.py | 7 +++++--
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/agkyra/agkyra/syncer/localfs_client.py b/agkyra/agkyra/syncer/localfs_client.py
index 5d58548..2ad1f4f 100644
--- a/agkyra/agkyra/syncer/localfs_client.py
+++ b/agkyra/agkyra/syncer/localfs_client.py
@@ -405,6 +405,8 @@ class LocalfsSourceHandle(object):
def check_log(self):
with self.heartbeat.lock() as hb:
prev_log = hb.get(self.objname)
+ logger.info("object: %s heartbeat: %s" %
+ (self.objname, prev_log))
if prev_log is not None:
actionstate, ts = prev_log
if actionstate != self.SIGNATURE or \
@@ -415,6 +417,7 @@ class LocalfsSourceHandle(object):
logger.warning("Ignoring previous run in %s: %s %s" %
(self.SIGNATURE, self.objname, prev_log))
hb.set(self.objname, (self.SIGNATURE, utils.time_stamp()))
+ print "LOG", self.heartbeat._LOG
def get_synced_state(self):
return self.source_state
@@ -446,6 +449,7 @@ class LocalfsSourceHandle(object):
def clear_log(self):
with self.heartbeat.lock() as hb:
hb.delete(self.objname)
+ logger.info("DELETED %s" % self.objname)
def do_unstage(self):
if self.stage_filename is None:
diff --git a/agkyra/agkyra/syncer/messaging.py b/agkyra/agkyra/syncer/messaging.py
index 6558e5b..937d110 100644
--- a/agkyra/agkyra/syncer/messaging.py
+++ b/agkyra/agkyra/syncer/messaging.py
@@ -40,8 +40,10 @@ class SyncMessage(Message):
self.objname = kwargs["objname"]
self.archive = kwargs["archive"]
self.serial = kwargs["serial"]
- self.logger.info("Syncing archive: %s, object: '%s', serial: %s" %
- (self.archive, self.objname, self.serial))
+ self.info = kwargs["info"]
+ self.logger.info("Syncing archive: %s, object: '%s', serial: %s "
+ "info: %s" %
+ (self.archive, self.objname, self.serial, self.info))
class AckSyncMessage(Message):
diff --git a/agkyra/agkyra/syncer/pithos_client.py b/agkyra/agkyra/syncer/pithos_client.py
index 818488b..8f5bd8b 100644
--- a/agkyra/agkyra/syncer/pithos_client.py
+++ b/agkyra/agkyra/syncer/pithos_client.py
@@ -83,6 +83,8 @@ class PithosSourceHandle(object):
def check_log(self):
with self.heartbeat.lock() as hb:
prev_log = hb.get(self.objname)
+ logger.info("object: %s heartbeat: %s" %
+ (self.objname, prev_log))
if prev_log is not None:
actionstate, ts = prev_log
if actionstate != self.SIGNATURE or \
@@ -149,7 +151,7 @@ class PithosSourceHandle(object):
def clear_log(self):
with self.heartbeat.lock() as hb:
hb.delete(self.objname)
-
+ logger.info("DELETED %s" % self.objname)
STAGED_FOR_DELETION_SUFFIX = ".pithos_staged_for_deletion"
exclude_staged_regex = ".*" + STAGED_FOR_DELETION_SUFFIX + "$"
diff --git a/agkyra/agkyra/syncer/syncer.py b/agkyra/agkyra/syncer/syncer.py
index 673475f..faccab0 100644
--- a/agkyra/agkyra/syncer/syncer.py
+++ b/agkyra/agkyra/syncer/syncer.py
@@ -223,6 +223,7 @@ class FileSyncer(object):
objname=source_state.objname,
archive=source_state.archive,
serial=source_state.serial,
+ info=source_state.info,
logger=logger)
self.messager.put(msg)
thread = threading.Thread(
@@ -276,8 +277,10 @@ class FileSyncer(object):
objname = synced_source_state.objname
source = synced_source_state.archive
target = synced_target_state.archive
- logger.info("Acking archive: %s, object: '%s', serial: %s" %
- (target, objname, serial))
+ tinfo = synced_target_state.info
+ logger.info("Acking archive: %s, object: '%s', serial: %s "
+ "info: %s" %
+ (target, objname, serial, tinfo))
decision_state = db.get_state(self.DECISION, objname)
sync_state = db.get_state(self.SYNC, objname)
--
GitLab