Skip to content
Snippets Groups Projects
Commit 796cbc1f authored by Moe Jette's avatar Moe Jette
Browse files

don't combine wiki2 get_nodes output in single hostlist expression if

their ARCH or OS differ.
parent 08e413c8
No related branches found
No related tags found
No related merge requests found
...@@ -233,6 +233,12 @@ static int _same_info(struct node_record *node1_ptr, ...@@ -233,6 +233,12 @@ static int _same_info(struct node_record *node1_ptr,
if (node1_ptr->part_pptr[i] != node2_ptr->part_pptr[i]) if (node1_ptr->part_pptr[i] != node2_ptr->part_pptr[i])
return 6; return 6;
} }
if (node1_ptr->arch && node2_ptr->arch) &&
strcmp(node1_ptr->arch, node2_ptr->arch))
return 7
if (node1_ptr->os && node2_ptr->os &&
strcmp(node1_ptr->os, node2_ptr->os))
return 8;
if (state_info == SLURM_INFO_VOLITILE) if (state_info == SLURM_INFO_VOLITILE)
return 0; return 0;
...@@ -244,18 +250,18 @@ static int _same_info(struct node_record *node1_ptr, ...@@ -244,18 +250,18 @@ static int _same_info(struct node_record *node1_ptr,
node2_ptr->config_ptr->tmp_disk) || node2_ptr->config_ptr->tmp_disk) ||
(node1_ptr->config_ptr->cpus != (node1_ptr->config_ptr->cpus !=
node2_ptr->config_ptr->cpus)) node2_ptr->config_ptr->cpus))
return 7; return 9;
} else { } else {
if ((node1_ptr->real_memory != node2_ptr->real_memory) || if ((node1_ptr->real_memory != node2_ptr->real_memory) ||
(node1_ptr->tmp_disk != node2_ptr->tmp_disk) || (node1_ptr->tmp_disk != node2_ptr->tmp_disk) ||
(node1_ptr->cpus != node2_ptr->cpus)) (node1_ptr->cpus != node2_ptr->cpus))
return 8; return 10;
} }
if ((node1_ptr->config_ptr->feature != if ((node1_ptr->config_ptr->feature !=
node2_ptr->config_ptr->feature) || node2_ptr->config_ptr->feature) ||
strcmp(node1_ptr->config_ptr->feature, strcmp(node1_ptr->config_ptr->feature,
node2_ptr->config_ptr->feature)) node2_ptr->config_ptr->feature))
return 9; return 11;
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment