client: maintain stats correctly when AM detaches/reattaches project

Science United maintains stats (CPU/GPU EC and time, job counts)
for each (host, project) pair.
The client reports these on each AM RPC;
the RPC handler computes the differences and updates things.

Problem: if SU detaches a project on a host,
the project disappears from the host.
If SU later reattaches it, the project will be created with all stats zero.
When this is reported to SU, the previous stats will be lost.

Solution: in the AM RPC reply, for projects not currently on the client
but with a host_project record in the SU database, include the stats;
in the client, parse these in the RPC reply
and use them to initialize the new project.

Author: davidpanderson

client/acct_mgr.cpp

@@ -302,6 +302,12 @@ int AM_ACCOUNT::parse(XML_PARSER& xp) {
     resource_share.init();
     user_avg_ec = 0;
     user_total_ec = 0;
+    cpu_ec = 0;
+    cpu_time = 0;
+    gpu_ec = 0;
+    gpu_time = 0;
+    njobs_success = 0;
+    njobs_error = 0;
 
     while (!xp.get_tag()) {
         if (!xp.is_tag) {
@@ -329,6 +335,12 @@ int AM_ACCOUNT::parse(XML_PARSER& xp) {
         if (xp.parse_bool("update", update)) continue;
         if (xp.parse_double("user_avg_ec", user_avg_ec)) continue;
         if (xp.parse_double("user_total_ec", user_total_ec)) continue;
+        if (xp.parse_double("cpu_ec", cpu_ec)) continue;
+        if (xp.parse_double("cpu_time", cpu_time)) continue;
+        if (xp.parse_double("gpu_ec", gpu_ec)) continue;
+        if (xp.parse_double("gpu_time", gpu_time)) continue;
+        if (xp.parse_int("njobs_success", njobs_success)) continue;
+        if (xp.parse_int("njobs_error", njobs_error)) continue;
         if (xp.parse_bool("no_cpu", btemp)) {
             handle_no_rsc("CPU", btemp);
             continue;
@@ -792,6 +804,12 @@ void ACCT_MGR_OP::handle_reply(int http_op_retval) {
                     if (gstate.acct_mgr_info.dynamic) {
                         pp->user_expavg_credit = acct.user_avg_ec;
                         pp->user_total_credit = acct.user_total_ec;
+                        pp->cpu_ec = acct.cpu_ec;
+                        pp->cpu_time = acct.cpu_time;
+                        pp->gpu_ec = acct.gpu_ec;
+                        pp->gpu_time = acct.gpu_time;
+                        pp->njobs_success = acct.njobs_success;
+                        pp->njobs_error = acct.njobs_error;
                     }
                 } else {
                     msg_printf(NULL, MSG_INTERNAL_ERROR,

client/acct_mgr.h

@@ -161,6 +161,13 @@ struct AM_ACCOUNT {
     OPTIONAL_BOOL abort_not_started;
     double user_avg_ec;
     double user_total_ec;
+    // the following present if client not already attached
+    double cpu_ec;
+    double cpu_time;
+    double gpu_ec;
+    double gpu_time;
+    int njobs_success;
+    int njobs_error;
 
     void handle_no_rsc(const char*, bool);
     int parse(XML_PARSER&);

client/project.h

@@ -121,12 +121,14 @@ struct PROJECT : PROJ_AM {
         // and this should go to 1.
         // But we need to keep it around for older projects
 
-    // accounting info; estimated credit and time for CPU and GPU
+    // accounting info for dynamic account managers;
     //
-    double cpu_ec;
-    double cpu_time;
+    double cpu_ec;      // estimated credit
+    double cpu_time;    // device/seconds
     double gpu_ec;
     double gpu_time;
+    int njobs_success;
+    int njobs_error;
 
     // stuff related to scheduler RPCs and master fetch
     //
@@ -154,6 +156,7 @@ struct PROJECT : PROJ_AM {
         // computed by get_disk_usages()
     double disk_share;
         // computed by get_disk_shares();
+    bool dont_use_dcf;
 
     ///////  END OF ITEMS STORED IN client_state.xml
 
@@ -192,8 +195,6 @@ struct PROJECT : PROJ_AM {
         // if nonzero, send this project's job log from that point on
     bool send_full_workload;
 
-    bool dont_use_dcf;
-
     bool suspended_via_gui;
     bool dont_request_more_work;
         // Return work, but don't request more
@@ -316,11 +317,6 @@ struct PROJECT : PROJ_AM {
     //
     APP_CONFIGS app_configs;
 
-    // job counting
-    //
-    int njobs_success;
-    int njobs_error;
-
     // total elapsed time of this project's jobs (for export to GUI)
     //
     double elapsed_time;