X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=3b3be9f1cd9a3c6d3815ad71946cd4991a8d5bb8;hb=7b1f19c0c338f5d8eb65fb45b57bb5de84398762;hp=e330b12221302795d0ef603bb7f97f726755aa88;hpb=20ff879c6dd74b94259998bd252118e8589789d2;p=csit.git diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index e330b12221..3b3be9f1cd 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -19,9 +19,8 @@ - filter the data using tags, """ -import multiprocessing -import os import re +import resource import pandas as pd import logging @@ -37,7 +36,6 @@ from json import loads from jumpavg.AvgStdevMetadataFactory import AvgStdevMetadataFactory from input_data_files import download_and_unzip_data_file -from utils import Worker # Separator used in file names @@ -1262,11 +1260,11 @@ class InputData(object): file_name = self._cfg.input["file-name"] full_name = join( self._cfg.environment["paths"]["DIR[WORKING,DATA]"], - "{job}{sep}{build}{sep}{name}". - format(job=job, - sep=SEPARATOR, - build=build["build"], - name=file_name)) + "{job}{sep}{build}{sep}{name}".format( + job=job, + sep=SEPARATOR, + build=build["build"], + name=file_name)) try: remove(full_name) logs.append(("INFO", @@ -1307,12 +1305,8 @@ class InputData(object): for build in builds: result = self._download_and_parse_build(job, build, repeat) - - job = result["job"] build_nr = result["build"]["build"] - logging.info(" {job}-{build}".format(job=job, - build=build_nr)) if result["data"]: data = result["data"] build_data = pd.Series({ @@ -1333,6 +1327,9 @@ class InputData(object): self._cfg.set_input_state(job, build_nr, result["state"]) + logging.info("Memory allocation: {0:,d}MB".format( + resource.getrusage(resource.RUSAGE_SELF).ru_maxrss / 1000)) + logging.info("Done.") @staticmethod