From 4d03d0b40835c405f277df03f52931ec337e7b34 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 15 Oct 2014 13:07:08 -0700
Subject: [PATCH] Revert "MYSQL - Fix load of archive files."
This reverts commit 1891936edb7c8639a0d530442a53d4faf49bafe5.
---
NEWS | 1 -
.../mysql/as_mysql_archive.c | 96 +++++++++----------
2 files changed, 48 insertions(+), 49 deletions(-)
diff --git a/NEWS b/NEWS
index e97d354c0e2..edc70969e9c 100644
--- a/NEWS
+++ b/NEWS
@@ -74,7 +74,6 @@ documents those changes that are of interest to users and admins.
with no way to get them out.
-- Fix issue with task/affinity oversubscribing cpus erroneously when
using --ntasks-per-node.
- -- MYSQL - Fix load of archive files.
* Changes in Slurm 14.03.8
==========================
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_archive.c b/src/plugins/accounting_storage/mysql/as_mysql_archive.c
index 876c02be5c7..4a6f1e10b35 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_archive.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_archive.c
@@ -1491,11 +1491,11 @@ _load_events(uint16_t rpc_version, Buf buffer, char *cluster_name,
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
- object.period_start,
- object.period_end,
- object.node_name,
object.cluster_nodes,
object.cpu_count,
+ object.node_name,
+ object.period_end,
+ object.period_start,
object.reason,
object.reason_uid,
object.state);
@@ -1796,15 +1796,15 @@ static char *_load_resvs(uint16_t rpc_version, Buf buffer,
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
- object.id,
object.assocs,
object.cpus,
object.flags,
+ object.id,
+ object.name,
object.nodes,
object.node_inx,
- object.name,
- object.time_start,
- object.time_end);
+ object.time_end,
+ object.time_start);
}
// END_TIMER2("step query");
// info("resv query took %s", TIME_STR);
@@ -1962,52 +1962,52 @@ static char *_load_steps(uint16_t rpc_version, Buf buffer,
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
+ object.ave_cpu,
+ object.act_cpufreq,
+ object.consumed_energy,
+ object.ave_disk_read,
+ object.ave_disk_write,
+ object.ave_pages,
+ object.ave_rss,
+ object.ave_vsize,
+ object.exit_code,
+ object.cpus,
object.id,
- object.stepid,
- object.period_start,
- object.period_end,
- object.period_suspended,
+ object.kill_requid,
+ object.max_disk_read,
+ object.max_disk_read_node,
+ object.max_disk_read_task,
+ object.max_disk_write,
+ object.max_disk_write_node,
+ object.max_disk_write_task,
+ object.max_pages,
+ object.max_pages_node,
+ object.max_pages_task,
+ object.max_rss,
+ object.max_rss_node,
+ object.max_rss_task,
+ object.max_vsize,
+ object.max_vsize_node,
+ object.max_vsize_task,
+ object.min_cpu,
+ object.min_cpu_node,
+ object.min_cpu_task,
object.name,
object.nodelist,
+ object.nodes,
object.node_inx,
+ object.period_end,
+ object.period_start,
+ object.period_suspended,
+ object.req_cpufreq,
object.state,
- object.kill_requid,
- object.exit_code,
- object.nodes,
- object.cpus,
+ object.stepid,
+ object.sys_sec,
+ object.sys_usec,
object.tasks,
object.task_dist,
object.user_sec,
- object.user_usec,
- object.sys_sec,
- object.sys_usec,
- object.max_vsize,
- object.max_vsize_task,
- object.max_vsize_node,
- object.ave_vsize,
- object.max_rss,
- object.max_rss_task,
- object.max_rss_node,
- object.ave_rss,
- object.max_pages,
- object.max_pages_task,
- object.max_pages_node,
- object.ave_pages,
- object.min_cpu,
- object.min_cpu_task,
- object.min_cpu_node,
- object.ave_cpu,
- object.act_cpufreq,
- object.consumed_energy,
- object.req_cpufreq,
- object.max_disk_read,
- object.max_disk_read_task,
- object.max_disk_read_node,
- object.ave_disk_read,
- object.max_disk_write,
- object.max_disk_write_task,
- object.max_disk_write_node,
- object.ave_disk_write);
+ object.user_usec);
}
// END_TIMER2("step query");
@@ -2124,10 +2124,10 @@ static char *_load_suspend(uint16_t rpc_version, Buf buffer,
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
- object.id,
object.associd,
- object.period_start,
- object.period_end);
+ object.id,
+ object.period_end,
+ object.period_start);
}
// END_TIMER2("suspend query");
--
GitLab