From a7a1da70996a3386be1688cbe68b8ba84ccfb24e Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 11 May 2015 16:57:22 -0700
Subject: [PATCH] Fix issue with count being overwritten on a cluster loc_tres

---
 src/plugins/accounting_storage/mysql/as_mysql_rollup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
index 92333b65f1e..2bac546d5cb 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
@@ -330,7 +330,7 @@ static void _add_tres_time_2_list(List tres_list, char *tres_str,
 
 		loc_tres = _add_time_tres(tres_list, type, id,
 					  time, times_count);
-		if (loc_tres)
+		if (loc_tres && !loc_tres->count)
 			loc_tres->count = count;
 
 		if (!(tmp_str = strchr(tmp_str, ',')))
-- 
GitLab