From 98103715f7b9cb7cc66dc07440d7d89a4e5eabf4 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 5 Oct 2007 23:39:27 +0000
Subject: [PATCH] svn merge -r12452:12458
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

---
 src/api/init_msg.c      | 1 +
 src/slurmctld/job_mgr.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/api/init_msg.c b/src/api/init_msg.c
index 7d593eff417..96a7044495f 100644
--- a/src/api/init_msg.c
+++ b/src/api/init_msg.c
@@ -74,6 +74,7 @@ void slurm_init_job_desc_msg(job_desc_msg_t * job_desc_msg)
 	job_desc_msg->job_min_procs   = (uint16_t) NO_VAL;
 	job_desc_msg->job_min_sockets = (uint16_t) NO_VAL;
 	job_desc_msg->job_min_threads = (uint16_t) NO_VAL;
+	job_desc_msg->job_max_memory  = NO_VAL;
 	job_desc_msg->job_min_memory  = NO_VAL;
 	job_desc_msg->job_min_tmp_disk= NO_VAL;
 	job_desc_msg->kill_on_node_fail = (uint16_t) NO_VAL;
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index d5f685c1694..4cae9450d62 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -2731,7 +2731,7 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
 	if (job_desc_msg->job_min_threads == (uint16_t) NO_VAL)
 		job_desc_msg->job_min_threads = 1; /* default 1 thread per core */
 	if (job_desc_msg->job_min_memory == NO_VAL)
-		job_desc_msg->job_min_memory = 1;  /* default 1MB mem per node */
+		job_desc_msg->job_min_memory = 0;  /* default 0MB mem per node */
 	if (job_desc_msg->job_max_memory == NO_VAL)
 		job_desc_msg->job_max_memory = 1;  /* default 1MB mem per node */
 	if (job_desc_msg->job_min_tmp_disk == NO_VAL)
-- 
GitLab