Merge pull request #350 from PanDAWMS/tk

eventservice | fix translation of numeric event states to string

core/constants.py

@@ -61,19 +61,19 @@
     'merging'
 )
 
-EVENT_STATES = (
-    'ready',
-    'sent',
-    'running',
-    'finished',
-    'cancelled',
-    'discarded',
-    'done',
-    'failed',
-    'fatal',
-    'merged',
-    'corrupted',
-)
+EVENT_STATES = MappingProxyType({
+    0: 'ready',
+    1: 'sent',
+    2: 'running',
+    3: 'finished',
+    4: 'cancelled',
+    5: 'discarded',
+    6: 'done',
+    7: 'failed',
+    8: 'fatal',
+    9: 'merged',
+    10: 'corrupted',
+})
 
 TASK_STATES = (
     'registered',

core/libs/eventservice.py

@@ -7,8 +7,8 @@
 from django.conf import settings
 from core.libs.exlib import dictfetchall, get_tmp_table_name, insert_to_temp_table
 from core.libs.dropalgorithm import insert_dropped_jobs_to_tmp_table, get_tmp_table_name_debug
-
 from core.common.models import JediEvents, GetEventsForTask
+from core import constants as const
 
 _logger = logging.getLogger('bigpandamon')
 
@@ -155,16 +155,14 @@ def add_event_summary_to_tasklist(tasks, transaction_key=None):
     return tasks
 
 
-def get_event_status_summary(pandaids, eventservicestatelist):
+def get_event_status_summary(pandaids):
     """
     Getting event statuses summary for list of pandaids of ES jobs
     :param pandaids: list
     :return: dict of status: nevents
     """
     summary = {}
-
     tmpTableName = get_tmp_table_name()
-
     transactionKey = insert_to_temp_table(pandaids)
     new_cur = connection.cursor()
     new_cur.execute(
@@ -177,9 +175,14 @@ def get_event_status_summary(pandaids, eventservicestatelist):
         ) t1 
         group by status""".format(tmpTableName, transactionKey, settings.DB_SCHEMA_PANDA))
 
-    evtable = dictfetchall(new_cur)
-
+    evtable = dictfetchall(new_cur, style='lowercase')
 
+    # translate numerical status to string, if not in const.EVENT_STATES, then it is 'unknown'
     for ev in evtable:
-        summary[ev['status']] = ev['countstat']
+        if ev['status'] in const.EVENT_STATES:
+            summary[const.EVENT_STATES[ev['status']]] = ev['countstat']
+        else:
+            if 'unknown' not in summary:
+                summary['unknown'] = 0
+            summary['unknown'] += ev['countstat']
     return summary

core/libs/exlib.py

@@ -77,7 +77,7 @@ def insert_to_temp_table(list_of_items, transactionKey = -1):
 
 
 def dictfetchall(cursor, **kwargs):
-    "Returns all rows from a cursor as a dict"
+    """Returns all rows from a cursor as a dict"""
     style = 'default'
     if 'style' in kwargs:
         style = kwargs['style']
@@ -87,11 +87,16 @@ def dictfetchall(cursor, **kwargs):
             dict(zip([str(col[0]).upper() for col in desc], row))
             for row in cursor.fetchall()
         ]
+    elif style == 'lowercase':
+        return [
+            dict(zip([str(col[0]).lower() for col in desc], row))
+            for row in cursor.fetchall()
+        ]
     else:
         return [
             dict(zip([col[0] for col in desc], row))
             for row in cursor.fetchall()
-            ]
+        ]
 
 
 def is_timestamp(key):

core/pandajob/utils.py

@@ -198,7 +198,7 @@ def job_summary_dict(request, jobs, fieldlist=None):
         if is_event_service(job):
             esjobs.append(job['pandaid'])
     if len(esjobs) > 0:
-        sumd['eventservicestatus'] = get_event_status_summary(esjobs, const.EVENT_STATES)
+        sumd['eventservicestatus'] = get_event_status_summary(esjobs)
 
     # convert to ordered lists
     suml = []

core/templates/jobList.html

@@ -157,7 +157,7 @@
             {% elif fdict.field  == 'harvesterinstance' %} {{ item.kname }} <a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
             {% elif fdict.field  == 'durationmin' %} {% if item.kvalue > 0 %} {{ item.kname }} <a href="{{nodurminurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a> {% endif %}
             {% elif fdict.field == 'produsername' %} <a href="{% url 'userInfo' item.kname %}"> {{ item.kname }} </a><a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
-            {% elif fdict.field == 'eventservicestatus' %} ({{ item.kvalue }})
+            {% elif fdict.field == 'eventservicestatus' %} <span class='{{item.kname}} item'>{{ item.kname }}</span> ({{ item.kvalue }})
             {% elif fdict.field == 'container_name' and request.session.xurls and fdict.field in request.session.xurls %} {{ item.kname }} <a href="{{ request.session.xurls.container_name }}{{ fdict.field }}={{ item.kname }}">({{ item.kvalue }})</a>
             {% elif fdict.field == 'jobstatus' %} <span class='{{item.kname}} item'>{{ item.kname }}</span>
                 {% if item.kname == 'closed:toreassign' %}

core/templates/jobListES.html

@@ -144,8 +144,11 @@ <h5>Warning! </h5>
     <td><div class="comment more">
         {% for item in fdict.list %}
             {% if fdict.field == 'jeditaskid' and item.kname != 'Not specified' %} <a href="{% url 'taskInfo' item.kname %}"> {{ item.kname }} </a><a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
-            {% elif fdict.field  == 'jobsetid'%} <a href="{% url 'jobList' %}?jobsetid={{ item.kname }}">{{ item.kname }}</a> <a href="{{xurl}}{{fdict.field}}={{item.kname}}" > ({{ item.kvalue }}) </a>
+            {% elif fdict.field  == 'jobsetid'%} <a href="{% url 'jobList' %}?jobsetid={{ item.kname }}"> {{ item.kname }}</a> <a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
+            {% elif fdict.field  == 'harvesterinstance' %} {{ item.kname }} <a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
+            {% elif fdict.field  == 'durationmin' %} {% if item.kvalue > 0 %} {{ item.kname }} <a href="{{nodurminurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a> {% endif %}
             {% elif fdict.field == 'produsername' %} <a href="{% url 'userInfo' item.kname %}"> {{ item.kname }} </a><a href="{{xurl}}{{fdict.field}}={{item.kname}}" >({{ item.kvalue }})</a>
+            {% elif fdict.field == 'eventservicestatus' %} <span class='{{item.kname}} item'>{{ item.kname }}</span> ({{ item.kvalue }})
             {% elif fdict.field == 'container_name' and request.session.xurls and fdict.field in request.session.xurls %} {{ item.kname }} <a href="{{ request.session.xurls.container_name }}{{ fdict.field }}={{ item.kname }}">({{ item.kvalue }})</a>
             {% elif fdict.field == 'jobstatus' %} <span class='{{item.kname}} item'>{{ item.kname }}</span>
                 {% if item.kname == 'closed:toreassign' %}