Changeset 3584

Timestamp:

10/30/2009 07:54:54 AM (3 weeks ago)

Author:

brian

Message:

Fix RSV summary graphs for UCSD.

Files:

• GraphUsers/gratia/setup/setup.cfg (modified) (1 diff)
• GraphUsers/gratia/setup/setup_basic.cfg (modified) (1 diff)
• GraphUsers/gratia/src/gratia/database/metrics.py (modified) (3 diffs)
• GraphUsers/gratia/src/gratia/database/query_handler.py (modified) (10 diffs)
• GraphUsers/gratia/src/gratia/tools/gip_record.py (modified) (1 diff)
• GraphUsers/gratia/src/gratia/tools/rsv_calc.py (modified) (3 diffs)

GraphUsers/gratia/setup/setup.cfg

@@ -1 +1 @@
-[bdist_rpm]
-requires = graphtool >= 0.5.3 MySQL-python python-sqlite Cheetah /usr/bin/ldapsearch setuptools CherryPy ZSI
-4
+5
-
-[install]

GraphUsers/gratia/setup/setup_basic.cfg

@@ -1 +1 @@
-[bdist_rpm]
-requires = graphtool >= 0.5.3 MySQL-python Cheetah setuptools CherryPy
-6
+7
-
-[install]

GraphUsers/gratia/src/gratia/database/metrics.py

@@ -133 +133 @@
-    and convert it into the "size" of the site as a function of time.
-    """
-
+#
-    results, md = results_parser(sql_results, globals=globals, **kw)
-    span = kw['span']
@@ -143 +143 @@
-        intervals = results[site].keys()
-        all_intervals.union_update(intervals)
-
+#
-    all_intervals = list(all_intervals)
-    all_intervals.sort()
@@ -220 +220 @@
-        elif pivot not in feds:
-            return pivot + ' (T3)'
-
+#
-        if feds[pivot].startswith('T1'):
-            return pivot + " (T1)"

GraphUsers/gratia/src/gratia/database/query_handler.py

@@ -202 +202 @@
-            return rg_to_r.get(pivot, pivot)
-        if preference == 'resource_group':
-
+#
-            return r_to_rg.get(pivot, pivot)
-        if preference == 'wlcg':
@@ -338 +338 @@
-        elif 'Generic' in pivot[0] and 'Community Grid' in result:
-            result.remove('Community Grid')
-
-
+#
+#
-        if result:
-            result = result.pop()
@@ -347 +347 @@
-        if 'Generic' in pivot[0]:
-            return 'DN not recorded (%s)' % pivot[-1]
-
+#
-        return "Uncategorized (%s)" % pivot[-1]
-
@@ -533 +533 @@
-        check_overlap(serviceData)
-    except:
-
+#
-        raise
-
@@ -702 +702 @@
-                        endtime = min(endtime, starttime + datetime.timedelta(0,
-                            86400))
-
-
+#
+#
-                    max_j_endtime = endtime
-
@@ -724 +724 @@
-
-def wlcg_availability(d, globals=globals(), **kw):
-
+#
-    kw['kind'] = 'pivot-group'
-    startTime = convert_to_datetime(kw['starttime'])
@@ -771 +771 @@
-    #print serviceSummary["Purdue-Steele"]
-    if "Maintenance" in metricNames:
-
+#
-        filter_summaries("MAINTENANCE", serviceNames, metricNames, serviceData,
-            serviceSummary)
@@ -790 +790 @@
-        service_to_resource, _ = globals['RSVQueries'].service_to_resource()
-
+    filtered_service_to_resource = {}
+    for service, resource in service_to_resource.items():
+        if resource.find("UCSD") >= 0:
+            print service, resource
+        if service[0] == 'GridFtp':
+            continue
+        filtered_service_to_resource[service] = resource
+    service_to_resource = filtered_service_to_resource
-    # initialize data
-
+#
-    init_data(d, serviceData, serviceNames, metricNames, startTime, endTime)
-
+#
-
-    # Build a map from service_type->parent_resource->(child resource list)
@@ -841 +849 @@
-
-    for service, serviceData in serviceTypeData.items():
-
-
+#
+#
-        serviceSummary = {}
-        
@@ -919 +927 @@
-    for key in keys:
-        val = summary[key]
-
+#
-
-def sam_site_availability(*args, **kw):

GraphUsers/gratia/src/gratia/tools/gip_record.py

@@ -326 +326 @@
-            se_name, 'total': total, 'free': free})
-
+        if total == 0 and free == 0:
+            continue
+
-        unique_id = entry.glue['SEUniqueID']
-        probeName = 'gip_storage:%s' % unique_id

GraphUsers/gratia/src/gratia/tools/rsv_calc.py

@@ -73 +73 @@
-        next_month = (cur.month % 12) + 1
-        next_year = cur.year + int(cur.month==12)
-
+#
-        cur = datetime.datetime(next_year, next_month, 1, 0, 0, 0)
-    try:
@@ -118 +118 @@
-        sites = query_rsv_site(rsv, 'wlcg_site_reliability', starttime,
-            endtime)
-"
+ for %s to %s" % (starttime, endtime)
-        for site in sites:
-            print site, sites[site]
@@ -138 +138 @@
-    def endTimeFunc(starttime):
-        return starttime + datetime.timedelta(1, 0)
+    today = datetime.datetime.now()
+    today = datetime.datetime(today.year, today.month, today.day)
+    today -= datetime.timedelta(1, 0)
+    times.insert(0, today)
+    print times
-    upload_data(times, rsv, conn, 86400, endTimeFunc)
-