Task #10339: log SIP size

LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltaclient.py

@@ -4,6 +4,7 @@ import time
 from lofar.common import isProductionEnvironment
 from lofar.lta.ingest.server.config import LTA_BASE_URL
 from lofar.lta.ingest.server.sip import *
+from lofar.common.util import humanreadablesize
 
 logger = logging.getLogger()
 
@@ -136,7 +137,7 @@ class LTAClient:
 
     def SendSIP(self, job_id, sip, storage_ticket):
         try:
-            logger.info("LTAClient.SendSIP sending sip for %s ...", job_id)
+            logger.info("LTAClient.SendSIP sending sip of %s for %s ...", humanreadablesize(len(sip)), job_id)
             start = time.time()
             #check sip before we upload it the the LTA
             if not validateSIPAgainstSchema(sip, log_prefix=str(job_id)):
@@ -155,7 +156,7 @@ class LTAClient:
             logger.error('LTAClient.SendSIP Received XML-RPC Fault: %s %s' % (err.faultCode, self.__hidePassword(err.faultString)))
             raise
         if result['result'] == 'ok':
-            logger.info('LTAClient.SendSIP: Successfully sent SIP for %s to the LTA', job_id)
+            logger.info('LTAClient.SendSIP: Successfully sent SIP of %s for %s to the LTA', humanreadablesize(len(sip)), job_id)
         elif result.get('error'):
             if "could not use SIP" in result['error']:
                 if 'is already in database with isValid 1 and Ticket state 40' in result['error']:

LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/momclient.py

@@ -8,6 +8,7 @@ from lofar.lta.ingest.common.job import jobState2String
 from lofar.lta.ingest.server.config import MOM_BASE_URL
 from lofar.common import isProductionEnvironment
 from lofar.lta.ingest.server.sip import *
+from lofar.common.util import humanreadablesize
 
 logger = logging.getLogger()
 
@@ -55,7 +56,7 @@ class MoMClient:
         self.__momURLsetStatus = MOM_BASE_URL + 'mom3/interface/service/setStatusDataProduct.do'
         self.__momURLlogout    = MOM_BASE_URL + 'useradministration/user/logout.do'
 
-        self.MAX_MOM_RETRIES   = 5
+        self.MAX_MOM_RETRIES   = 3
 
 
     def __login(self):
@@ -242,7 +243,9 @@ class MoMClient:
                 if time.time() - start > 2:
                     logger.debug("MoMClient.uploadDataAndGetSIP for %s took %ds", filename, time.time() - start)
 
-                logger.info("MoMClient.uploadDataAndGetSIP for %s retreived SIP: %s...", filename, result[:512].replace('\n',''))
+                logger.info("MoMClient.uploadDataAndGetSIP for %s retreived SIP of %s: %s...",
+                            filename,
+                            humanreadablesize(len(result)),                                                                                                                           result[:512].replace('\n',''))
                 return result
         except Exception as e:
             self.__logout()