Skip to content

Another fix to match the expected format by SSB #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artiedaj merged 1 commit into from
Apr 11, 2014
Merged

Another fix to match the expected format by SSB #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions WFM_Input_DashBoard/WFMonDBShort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ def handleDict(dict, description, date, hour, server):

# add site/scheduler jobs per type to 'description''type' file
file = open('./'+description+type+'.txt', 'a')
file.write( "%s %s\t%s\t%s\t%s\t%s%s%s\n" % (date, hour, entry, str(int(dict[entry][type])), 'green', site_link, entry.replace(".","_").strip(), endpoint_entry ))
file.write( "%s %s\t%s\t%s\t%s\t%s%s%s\n" % (date, hour, entry, str(int(dict[entry][type])), 'green', site_link, entry, endpoint_entry ))

lineSite += " %10s |" % int(sum)

# add site/scheduler total jobs to 'description'Total file
file = open('./'+description+"Total"+'.txt', 'a')
file.write( "%s %s\t%s\t%s\t%s\t%s%s%s\n" % (date, hour, entry, str(int(sum)), 'green', site_link, entry.replace(".","_").strip(), endpoint_entry ))
file.write( "%s %s\t%s\t%s\t%s\t%s%s%s\n" % (date, hour, entry, str(int(sum)), 'green', site_link, entry, endpoint_entry ))

print lineSite

Expand Down Expand Up @@ -375,7 +375,7 @@ def jsonDict(json_name,currTime,date,hour,key):
sumRunning += running[entry][type]

json_entry = dict()
json_entry[key] = str(entry).replace(".","_").strip()
json_entry[key] = str(entry)
json_entry["Pending"] = str(int(sumPending))
json_entry["TimeDate"] = str(currTime.strip())
json_entry["Running"] = str(int(sumRunning))
Expand Down Expand Up @@ -450,7 +450,7 @@ def main():
print "INFO: Handling condor_q on collector: %s scheduler: %s" % (col, sched)

if not sched in overview_running_vobox.keys():
addVoBox(sched)
addVoBox(sched.replace(".","_").strip())

for line in out.split('\n') :
if line == "" :
Expand Down Expand Up @@ -492,10 +492,10 @@ def main():

if status == "2":
increaseRunning(siteToExtract[0],type) # I assume one job can only run at one site
increaseRunningVoBox(sched,type)
increaseRunningVoBox(sched.replace(".","_").strip(),type)
elif status == "1":
temp_pending.append([type,siteToExtract])
increasePendingVoBox(sched,type)
increasePendingVoBox(sched.replace(".","_").strip(),type)
else: # We do not care about jobs in another status (condor job status: https://htcondor-wiki.cs.wisc.edu/index.cgi/wiki?p=MagicNumbers)
continue
print "INFO: Full condor status pooling is done"
Expand Down