diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py index f6d8fd6ee14af268c6ecfe3d751da3d8c6d74c4f..db004f1417a4da103e7bf2c6d18c89fa1608a33a 100644 --- a/lib/rapi/rlib2.py +++ b/lib/rapi/rlib2.py @@ -81,12 +81,17 @@ G_FIELDS = [ "node_list", ] + _COMMON_FIELDS -J_FIELDS = [ +J_FIELDS_BULK = [ "id", "ops", "status", "summary", - "opstatus", "opresult", "oplog", + "opstatus", "received_ts", "start_ts", "end_ts", ] +J_FIELDS = J_FIELDS_BULK + [ + "oplog", + "opresult", + ] + _NR_DRAINED = "drained" _NR_MASTER_CANDIATE = "master-candidate" _NR_MASTER = "master" @@ -240,8 +245,8 @@ class R_2_jobs(baserlib.R_Generic): client = baserlib.GetClient() if self.useBulk(): - bulkdata = client.QueryJobs(None, J_FIELDS) - return baserlib.MapBulkFields(bulkdata, J_FIELDS) + bulkdata = client.QueryJobs(None, J_FIELDS_BULK) + return baserlib.MapBulkFields(bulkdata, J_FIELDS_BULK) else: jobdata = map(compat.fst, client.QueryJobs(None, ["id"])) return baserlib.BuildUriList(jobdata, "/2/jobs/%s",