BF: CS-1940 dbwriter reports an error when parsing accounting records around midnight

Author: jgabler-hpc

source/daemons/qmaster/sge_rusage.cc

@@ -60,7 +60,7 @@
 #include "msg_qmaster.h"
 
 #define ACTFILE_FPRINTF_FORMAT \
-"%s%c%s%c%s%c%s%c%s%c" sge_u32 "%c%s%c" sge_u32 "%c" sge_u64 "%c" sge_u64 "%c" sge_u64 "%c" sge_u32 "%c" sge_u32 "%c" \
+"%s%c%s%c%s%c%s%c%s%c" sge_u32 "%c%s%c" sge_u32 "%c" sge_u64 "%c" sge_u64 "%c" sge_u64 "%c" sge_u32 "%c%d%c" \
 sge_u32 "%c%f%c%f%c%f%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c%f%c" \
 sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c%s%c%s%c%s%c%d%c" sge_u32 "%c%f%c%f%c%f%c%s%c%f%c%s%c%f%c" sge_u32 "%c" sge_u64 "" \
 "\n"
@@ -74,7 +74,7 @@ sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c%s%c
 *
 *  SYNOPSIS
 *     static uint32_t
-*     reporting_get_ulong_usage(const lList *usage_list, lList *reported_list, 
+*     reporting_get_ulong_usage(const lList *usage_list, lList *reported_list,
 *                               const char *name, const char *rname, uint32_t def)
 *
 *  FUNCTION
@@ -84,10 +84,10 @@ sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c%s%c
 *     If no usage information is available for the given attribute, a default
 *     value will be returned.
 *
-*     name and rname may differ, as already reported usage is taken from job 
+*     name and rname may differ, as already reported usage is taken from job
 *     online usage, e.g. attr USAGE_ATTR_CPU, whereas the final usage
 *     is reported in the attr USAGE_ATTR_CPU_ACCT. When we report final usage,
-*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract 
+*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract
 *     already reported usage coming from online usage USAGE_ATTR_CPU.
 *
 *  INPUTS
@@ -102,7 +102,7 @@ sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c" sge_u32 "%c%s%c
 *     static uint32_t - the usage
 *
 *  NOTES
-*     MT-NOTE: reporting_get_ulong_usage() is MT safe 
+*     MT-NOTE: reporting_get_ulong_usage() is MT safe
 *
 *  SEE ALSO
 *     sgeobj/usage/usage_list_get_ulong_usage()
@@ -122,7 +122,7 @@ reporting_get_ulong_usage(const lList *usage_list, lList *reported_list,
       /* after this action, we'll have reported the total usage */
       usage_list_set_ulong_usage(reported_list, rname, usage);
 
-      /* in this intermediate accounting record, we'll report the usage 
+      /* in this intermediate accounting record, we'll report the usage
        * consumed since the last intermediate accounting record.
        */
       usage -= reported;
@@ -152,10 +152,10 @@ reporting_get_ulong_usage(const lList *usage_list, lList *reported_list,
 *     If reported_usage is nullptr, no usage will be booked as already reported,
 *     e.g. for maximum values.
 *
-*     name and rname may differ, as already reported usage is taken from job 
+*     name and rname may differ, as already reported usage is taken from job
 *     online usage, e.g. attr USAGE_ATTR_CPU, whereas the final usage
 *     is reported in the attr USAGE_ATTR_CPU_ACCT. When we report final usage,
-*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract 
+*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract
 *     already reported usage coming from online usage USAGE_ATTR_CPU.
 *
 *  INPUTS
@@ -172,7 +172,7 @@ reporting_get_ulong_usage(const lList *usage_list, lList *reported_list,
 *     static uint32_t - the usage
 *
 *  NOTES
-*     MT-NOTE: reporting_get_ulong_usage_sum() is MT safe 
+*     MT-NOTE: reporting_get_ulong_usage_sum() is MT safe
 *
 *  SEE ALSO
 *     sge_rusage/reporting_get_ulong_usage()
@@ -208,8 +208,8 @@ reporting_get_ulong_usage_sum(const lList *usage_list, lList *reported_list, boo
 *
 *  SYNOPSIS
 *     static double
-*     reporting_get_double_usage(const lList *usage_list, lList *reported_list, 
-*                                const char *name, const char *rname, double def) 
+*     reporting_get_double_usage(const lList *usage_list, lList *reported_list,
+*                                const char *name, const char *rname, double def)
 *
 *  FUNCTION
 *     Return the usage information of a certain attribute (e.g. cpu, mem, ...).
@@ -218,10 +218,10 @@ reporting_get_ulong_usage_sum(const lList *usage_list, lList *reported_list, boo
 *     If no usage information is available for the given attribute, a default
 *     value will be returned.
 *
-*     name and rname may differ, as already reported usage is taken from job 
+*     name and rname may differ, as already reported usage is taken from job
 *     online usage, e.g. attr USAGE_ATTR_CPU, whereas the final usage
 *     is reported in the attr USAGE_ATTR_CPU_ACCT. When we report final usage,
-*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract 
+*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract
 *     already reported usage coming from online usage USAGE_ATTR_CPU.
 *
 *  INPUTS
@@ -236,7 +236,7 @@ reporting_get_ulong_usage_sum(const lList *usage_list, lList *reported_list, boo
 *     static double - the usage
 *
 *  NOTES
-*     MT-NOTE: reporting_get_double_usage() is MT safe 
+*     MT-NOTE: reporting_get_double_usage() is MT safe
 *
 *  SEE ALSO
 *     sgeobj/usage/usage_list_get_double_usage()
@@ -256,7 +256,7 @@ reporting_get_double_usage(const lList *usage_list, lList *reported_list, const
       /* after this action, we'll have reported the total usage */
       usage_list_set_double_usage(reported_list, rname, usage);
 
-      /* in this intermediate accounting record, we'll report the usage 
+      /* in this intermediate accounting record, we'll report the usage
        * consumed since the last intermediate accounting record.
        */
       usage -= reported;
@@ -286,10 +286,10 @@ reporting_get_double_usage(const lList *usage_list, lList *reported_list, const
 *     If reported_usage is nullptr, no usage will be booked as already reported,
 *     e.g. for maximum values.
 *
-*     name and rname may differ, as already reported usage is taken from job 
+*     name and rname may differ, as already reported usage is taken from job
 *     online usage, e.g. attr USAGE_ATTR_CPU, whereas the final usage
 *     is reported in the attr USAGE_ATTR_CPU_ACCT. When we report final usage,
-*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract 
+*     we take the usage given by USAGE_ATTR_CPU_ACCT, but have to subtract
 *     already reported usage coming from online usage USAGE_ATTR_CPU.
 *
 *  INPUTS
@@ -306,7 +306,7 @@ reporting_get_double_usage(const lList *usage_list, lList *reported_list, const
 *     static double - the usage
 *
 *  NOTES
-*     MT-NOTE: reporting_get_double_usage_sum() is MT safe 
+*     MT-NOTE: reporting_get_double_usage_sum() is MT safe
 *
 *  SEE ALSO
 *     sge_rusage/reporting_get_double_usage()
@@ -374,7 +374,7 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
    uint64_t now = sge_get_gmt64();
    uint32_t ar_id = 0;
    lListElem *ar = nullptr;
-   uint32_t exit_status = 0;
+   int exit_status = 0;
    bool do_accounting_summary = false;
    const lList *master_pe_list = *ocs::DataStore::get_master_list(SGE_TYPE_PE);
    const lList *master_ar_list = *ocs::DataStore::get_master_list(SGE_TYPE_AR);
@@ -389,7 +389,7 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
       DRETURN(false);
    }
 
-   /* 
+   /*
     * Figure out if it is a parallel job,
     * and if we shall write individual accounting entries or a summary.
     */
@@ -429,7 +429,7 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
    }
 
    /*
-    * For intermediate records, we store the reported usage in 
+    * For intermediate records, we store the reported usage in
     * ja_task or pe_task reported_list.
     */
    if (intermediate) {
@@ -439,7 +439,7 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
          reported_list = lGetOrCreateList(ja_task, JAT_reported_usage_list, "reported_usage", UA_Type);
       }
 
-      /* 
+      /*
        * The LAST_INTERMEDIATE timestamp of the previous intermediate
        * record is the start_time of the current interval.
        */
@@ -470,13 +470,13 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
 
    if (intermediate) {
       /*
-       * for the job, we don't have the submission time in the job report 
-       * before job exit 
+       * for the job, we don't have the submission time in the job report
+       * before job exit
        */
       if (job != nullptr && pe_task == nullptr) {
          submission_time = lGetUlong64(job, JB_submission_time);
       }
-      /* 
+      /*
        * For the first intermediate record, the start_time is the ja_task start time.
        * For consequent intermediate records, we already set the start_time to the
        * previous intermediate record's end time.
@@ -500,10 +500,10 @@ sge_write_rusage(dstring *buffer, rapidjson::Writer<rapidjson::StringBuffer> *wr
        * In this case set exit_status to -1, meaning in ARCo: Job still running.
        * See CR 6621482.
        */
-      exit_status = usage_list_get_ulong_usage(usage_list, "exit_status", -1);
+      exit_status = usage_list_get_int_usage(usage_list, "exit_status", -1);
    } else {
       start_time = usage_list_get_ulong64_usage(usage_list, "start_time", 0);
-      exit_status = usage_list_get_ulong_usage(usage_list, "exit_status", 0);
+      exit_status = usage_list_get_int_usage(usage_list, "exit_status", 0);
    }
 
    ar_id = lGetUlong(job, JB_ar);

source/libs/sgeobj/sge_usage.cc

@@ -1,33 +1,33 @@
 /*___INFO__MARK_BEGIN__*/
 /*************************************************************************
- * 
+ *
  *  The Contents of this file are made available subject to the terms of
  *  the Sun Industry Standards Source License Version 1.2
- * 
+ *
  *  Sun Microsystems Inc., March, 2001
- * 
- * 
+ *
+ *
  *  Sun Industry Standards Source License Version 1.2
  *  =================================================
  *  The contents of this file are subject to the Sun Industry Standards
  *  Source License Version 1.2 (the "License"); You may not use this file
  *  except in compliance with the License. You may obtain a copy of the
  *  License at http://gridengine.sunsource.net/Gridengine_SISSL_license.html
- * 
+ *
  *  Software provided under this License is provided on an "AS IS" basis,
  *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
  *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
  *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
  *  See the License for the specific provisions governing your rights and
  *  obligations concerning the Software.
- * 
+ *
  *   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- * 
+ *
  *   Copyright: 2001 by Sun Microsystems, Inc.
- * 
+ *
  *   All Rights Reserved.
- * 
- *  Portions of this software are Copyright (c) 2023-2026 HPC-Gridware GmbH
+ *
+ *  Portions of this software are Copyright (c) 2023-2024,2026 HPC-Gridware GmbH
  *
  ************************************************************************/
 /*___INFO__MARK_END__*/
@@ -45,12 +45,12 @@
 *
 *  SYNOPSIS
 *     uint32_t
-*     usage_list_get_ulong_usage(const lList *usage_list, const char *name, 
+*     usage_list_get_ulong_usage(const lList *usage_list, const char *name,
 *                                uint32_t def)
 *
 *  FUNCTION
-*     Searches a usage object with the given name in the given usage 
-*     list. If such an element is found, returns the value of the 
+*     Searches a usage object with the given name in the given usage
+*     list. If such an element is found, returns the value of the
 *     usage object as uint32_t value.
 *     If no such element is found, return the given default value.
 *
@@ -65,25 +65,31 @@
 *  SEE ALSO
 *     gdi/usage/usage_list_get_double_usage()
 *******************************************************************************/
+int
+usage_list_get_int_usage(const lList *usage_list, const char *name, int def) {
+   const lListElem *ep = lGetElemStr(usage_list, UA_name, name);
+   if (ep != nullptr) {
+      return static_cast<int>(lGetDouble(ep, UA_value));
+   } else {
+      return def;
+   }
+}
+
 uint32_t
-usage_list_get_ulong_usage(const lList *usage_list, const char *name,
-                           uint32_t def)
-{
+usage_list_get_ulong_usage(const lList *usage_list, const char *name, uint32_t def) {
    const lListElem *ep = lGetElemStr(usage_list, UA_name, name);
    if (ep != nullptr) {
-      return (uint32_t)lGetDouble(ep, UA_value);
+      return static_cast<uint32_t>(lGetDouble(ep, UA_value));
    } else {
       return def;
    }
 }
 
 uint64_t
-usage_list_get_ulong64_usage(const lList *usage_list, const char *name,
-                             uint64_t def)
-{
+usage_list_get_ulong64_usage(const lList *usage_list, const char *name, uint64_t def) {
    const lListElem *ep = lGetElemStr(usage_list, UA_name, name);
    if (ep != nullptr) {
-      return (uint64_t)lGetDouble(ep, UA_value);
+      return static_cast<uint64_t>(lGetDouble(ep, UA_value));
    } else {
       return def;
    }
@@ -95,12 +101,12 @@ usage_list_get_ulong64_usage(const lList *usage_list, const char *name,
 *
 *  SYNOPSIS
 *     double
-*     usage_list_get_double_usage(const lList *usage_list, const char *name, 
-*                                 double def) 
+*     usage_list_get_double_usage(const lList *usage_list, const char *name,
+*                                 double def)
 *
 *  FUNCTION
-*     Searches a usage object with the given name in the given usage 
-*     list. If such an element is found, returns the value of the 
+*     Searches a usage object with the given name in the given usage
+*     list. If such an element is found, returns the value of the
 *     usage object as double value.
 *     If no such element is found, return the given default value.
 *
@@ -133,7 +139,7 @@ usage_list_get_double_usage(const lList *usage_list, const char *name,
 *
 *  SYNOPSIS
 *     void
-*     usage_list_set_ulong_usage(lList *usage_list, const char *name, 
+*     usage_list_set_ulong_usage(lList *usage_list, const char *name,
 *                                uint32_t value)
 *
 *  FUNCTION
@@ -146,7 +152,7 @@ usage_list_get_double_usage(const lList *usage_list, const char *name,
 *     uint32_t value    - the new value
 *
 *  NOTES
-*     MT-NOTE: usage_list_set_ulong_usage() is MT safe 
+*     MT-NOTE: usage_list_set_ulong_usage() is MT safe
 *
 *  SEE ALSO
 *     sgeobj/usage/usage_list_set_double_usage()
@@ -171,8 +177,8 @@ usage_list_set_ulong64_usage(lList *usage_list, const char *name, uint64_t value
 *
 *  SYNOPSIS
 *     void
-*     usage_list_set_double_usage(lList *usage_list, const char *name, 
-*                                 double value) 
+*     usage_list_set_double_usage(lList *usage_list, const char *name,
+*                                 double value)
 *
 *  FUNCTION
 *     Updates the value of a usage record. If no usage record exists with the
@@ -185,7 +191,7 @@ usage_list_set_ulong64_usage(lList *usage_list, const char *name, uint64_t value
 *     bool create_usage - create the usage element if it does not exist? Default: yes.
 *
 *  NOTES
-*     MT-NOTE: usage_list_set_double_usage() is MT safe 
+*     MT-NOTE: usage_list_set_double_usage() is MT safe
 *
 *  SEE ALSO
 *     sgeobj/usage/usage_list_set_ulong_usage()
@@ -236,8 +242,8 @@ usage_list_max_double_usage(lList *usage_list, const char *name, double value, b
 *     usage_list_sum() -- sum up usage of two lists
 *
 *  SYNOPSIS
-*     void 
-*     usage_list_sum(lList *usage_list, const lList *add_usage_list) 
+*     void
+*     usage_list_sum(lList *usage_list, const lList *add_usage_list)
 *
 *  FUNCTION
 *     Add the usage reported in add_usage_list to usage_list.
@@ -255,7 +261,7 @@ usage_list_max_double_usage(lList *usage_list, const char *name, double value, b
 *     const lList *add_usage_list - usage to add to usage_list
 *
 *  NOTES
-*     MT-NOTE: usage_list_sum() is MT safe 
+*     MT-NOTE: usage_list_sum() is MT safe
 *******************************************************************************/
 void
 usage_list_sum(lList *usage_list, const lList *add_usage_list)

source/libs/sgeobj/sge_usage.h

@@ -44,7 +44,7 @@ enum {
 
 /*
  * sge standard usage value names
- * 
+ *
  * use these defined names for refering special usage values
  */
 
@@ -82,6 +82,8 @@ enum {
 #define USAGE_ATTR_RSS "rss"
 #define USAGE_ATTR_MAXRSS "maxrss"
 
+int
+usage_list_get_int_usage(const lList *usage_list, const char *name, int def);
 uint32_t
 usage_list_get_ulong_usage(const lList *usage_list, const char *name, uint32_t def);
 uint64_t