From 581517899207a7790b8d944720e3495113bfac4e Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Wed, 5 Jun 2019 18:15:09 +0200
Subject: [PATCH] Added subdir to stagerrm log of cta-fst-gcd
---
python/eosfstgcd/cta-fst-gcd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/eosfstgcd/cta-fst-gcd b/python/eosfstgcd/cta-fst-gcd
index 257e05aacc..358a983c12 100755
--- a/python/eosfstgcd/cta-fst-gcd
+++ b/python/eosfstgcd/cta-fst-gcd
@@ -188,7 +188,7 @@ class Gc:
return result
- def eosstagerrm(self, fxid, freebytes):
+ def eosstagerrm(self, fxid, subdir, freebytes):
logger = logging.getLogger('gc')
mgmurl = "root://{}".format(self.mgmhost)
cmd = "eos {} stagerrm fxid:{}".format(mgmurl, fxid)
@@ -197,7 +197,7 @@ class Gc:
process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
stdout,stderr = process.communicate()
if 0 == process.returncode:
- logger.info("minfreebytes={} freebytesbefore={} executed='{}'".format(self.minfreebytes, freebytes, cmd))
+ logger.info("minfreebytes={} subdir={} freebytesbefore={} executed='{}'".format(self.minfreebytes, subdir, freebytes, cmd))
def processfile(self, subdir, fstfile):
statvfs = os.statvfs(subdir)
@@ -210,7 +210,7 @@ class Gc:
now = time.time()
agesecs = now - statinfo.st_ctime
if agesecs > self.gcagesecs:
- self.eosstagerrm(fstfile, freebytes)
+ self.eosstagerrm(fstfile, subdir, freebytes)
self.nbfilesconsideredsincelastreport = self.nbfilesconsideredsincelastreport + 1
if self.nbfilesbeforereport == self.nbfilesconsideredsincelastreport:
--
GitLab