View | Details | Raw Unified | Return to ticket 1455
Collapse All | Expand All

(-)a/src/squeue/opts.c (-2 / +17 lines)
Lines 290-296 parse_command_line( int argc, char* argv[] ) Link Here
290
		case (int) 'w':
290
		case (int) 'w':
291
			if (params.nodes)
291
			if (params.nodes)
292
				hostset_destroy(params.nodes);
292
				hostset_destroy(params.nodes);
293
293
			info("%s: -w %s", __func__, optarg);
294
			params.nodes = hostset_create(optarg);
294
			params.nodes = hostset_create(optarg);
295
			if (params.nodes == NULL) {
295
			if (params.nodes == NULL) {
296
				error("'%s' invalid entry for --nodelist",
296
				error("'%s' invalid entry for --nodelist",
Lines 355-360 parse_command_line( int argc, char* argv[] ) Link Here
355
		while ( hostset_count(params.nodes) > 0 ) {
355
		while ( hostset_count(params.nodes) > 0 ) {
356
			name1 = hostset_pop(params.nodes);
356
			name1 = hostset_pop(params.nodes);
357
357
358
			info("%s: translate %s", __func__, name1);
359
358
			/* localhost = use current host name */
360
			/* localhost = use current host name */
359
			if ( strcasecmp("localhost", name1) == 0 ) {
361
			if ( strcasecmp("localhost", name1) == 0 ) {
360
				name2 = xmalloc(128);
362
				name2 = xmalloc(128);
Lines 363-371 parse_command_line( int argc, char* argv[] ) Link Here
363
				/* translate NodeHostName to NodeName */
365
				/* translate NodeHostName to NodeName */
364
				name2 = slurm_conf_get_nodename(name1);
366
				name2 = slurm_conf_get_nodename(name1);
365
367
368
				if (name2) {
369
					info("%s: 0 name2 %s", __func__, name2);
370
				}
366
				/* use NodeName if translation failed */
371
				/* use NodeName if translation failed */
367
				if ( name2 == NULL )
372
				if (name2 == NULL) {
368
					name2 = xstrdup(name1);
373
					name2 = xstrdup(name1);
374
					info("%s: 1 name2 %s", __func__, name2);
375
				}
369
			}
376
			}
370
			hostset_insert(nodenames, name2);
377
			hostset_insert(nodenames, name2);
371
			free(name1);
378
			free(name1);
Lines 1935-1940 static bool Link Here
1935
_check_node_names(hostset_t names)
1942
_check_node_names(hostset_t names)
1936
{
1943
{
1937
	int cc;
1944
	int cc;
1945
	int num;
1938
	node_info_msg_t *node_info;
1946
	node_info_msg_t *node_info;
1939
	char *host;
1947
	char *host;
1940
	hostlist_iterator_t itr;
1948
	hostlist_iterator_t itr;
Lines 1950-1955 _check_node_names(hostset_t names) Link Here
1950
		return false;
1958
		return false;
1951
	}
1959
	}
1952
1960
1961
	num = node_info->record_count;
1962
	info("%s: slurm_load_num() returned %d num %d", __func__, cc, num);
1963
	for (cc = 0; cc < num; cc++) {
1964
		info("%s: node name %s", __func__,
1965
		     node_info->node_array[cc].name);
1966
	}
1967
1953
	itr = hostset_iterator_create(names);
1968
	itr = hostset_iterator_create(names);
1954
	while ((host = hostlist_next(itr))) {
1969
	while ((host = hostlist_next(itr))) {
1955
		if (!_find_a_host(host, node_info)) {
1970
		if (!_find_a_host(host, node_info)) {

Return to ticket 1455