EH: CS-760 JSONL output shows nested element ("usage") with the same name which can confuse and lead to parsing issues

Author: jgabler-hpc

source/clients/qacct/ocs_qacct.cc

@@ -2251,7 +2251,8 @@ sge_read_rusage_json(const char *line, sge_rusage_type *d, sge_qacct_options *op
                d->ru_nsignals = read_json(json_usage, "ru_nsignals", (u_long32) 0);
                d->ru_nvcsw = read_json(json_usage, "ru_nvcsw", (u_long32) 0);
                d->ru_nivcsw = read_json(json_usage, "ru_nivcsw", (u_long32) 0);
-            } else if (sge_strnullcmp(itr->name.GetString(), "usage") == 0) {
+            } else if (sge_strnullcmp(itr->name.GetString(), "eusage") == 0 ||
+                       sge_strnullcmp(itr->name.GetString(), "usage") == 0) { // for backward compatibility
                const rapidjson::Value &json_usage = itr->value;
                d->wallclock = read_json(json_usage, "wallclock", 0.0);
                d->cpu = read_json(json_usage, "cpu", 0.0);

source/daemons/qmaster/sge_rusage.cc

@@ -691,7 +691,7 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
                                                                     ja_task, "ru_nivcsw", "ru_nivcsw", 0));
       writer->EndObject();
 
-      writer->Key("usage");
+      writer->Key("eusage");
       writer->StartObject();
       write_json(*writer, USAGE_ATTR_WALLCLOCK, reporting_get_double_usage_sum(usage_list, reported_list, do_accounting_summary, ja_task,
                                                                         USAGE_ATTR_WALLCLOCK, USAGE_ATTR_WALLCLOCK, 0));