From 613fa4673cc83c6b79e05f428f6dae74abb520e3 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 22 Jul 2011 10:43:15 -0700
Subject: [PATCH] better error messages for multi cluster mode
---
src/sbatch/opt.c | 11 +++++++++--
src/scancel/opt.c | 5 ++++-
src/scontrol/scontrol.c | 16 +++++++++++++---
src/sinfo/opts.c | 10 ++++++++--
src/smap/opts.c | 5 ++++-
src/sprio/opts.c | 11 +++++++++--
src/squeue/opts.c | 10 ++++++++--
src/sshare/sshare.c | 5 ++++-
src/strigger/opts.c | 5 ++++-
9 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 2733f0c32c1..ca5f6d28054 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -633,7 +633,11 @@ _process_env_var(env_vars_t *e, const char *val)
break;
case OPT_CLUSTERS:
if (!(opt.clusters = slurmdb_get_info_cluster((char *)val))) {
- error("'%s' invalid entry for --clusters", val);
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
+ optarg);
exit(1);
}
break;
@@ -1228,7 +1232,10 @@ static void _set_options(int argc, char **argv)
list_destroy(opt.clusters);
if (!(opt.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --clusters",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index 608eee82649..40e93563988 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -369,7 +369,10 @@ static void _opt_args(int argc, char **argv)
list_destroy(opt.clusters);
opt.clusters = slurmdb_get_info_cluster(optarg);
if (!opt.clusters) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index f053540e541..4a399bcf626 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -121,7 +121,11 @@ main (int argc, char *argv[])
all_flag= 1;
if ((env_val = getenv("SLURM_CLUSTERS"))) {
if (!(clusters = slurmdb_get_info_cluster(env_val))) {
- error("'%s' invalid entry for SLURM_CLUSTERS", env_val);
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "SLURM_CLUSTERS. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
+ env_val);
exit(1);
}
working_cluster_rec = list_peek(clusters);
@@ -156,7 +160,10 @@ main (int argc, char *argv[])
working_cluster_rec = NULL;
}
if (!(clusters = slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
@@ -596,7 +603,10 @@ _process_command (int argc, char *argv[])
}
if (argc >= 2) {
if (!(clusters = slurmdb_get_info_cluster(argv[1]))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index 13edb8df11a..a2fdf82f2dd 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -126,7 +126,10 @@ extern void parse_command_line(int argc, char *argv[])
params.sort = xstrdup(env_val);
if ( ( env_val = getenv("SLURM_CLUSTERS") ) ) {
if (!(params.clusters = slurmdb_get_info_cluster(env_val))) {
- error("'%s' invalid entry for SLURM_CLUSTERS",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "SLURM_CLUSTERS. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
env_val);
exit(1);
}
@@ -181,7 +184,10 @@ extern void parse_command_line(int argc, char *argv[])
list_destroy(params.clusters);
if (!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/smap/opts.c b/src/smap/opts.c
index fe30cb01d47..8237de5e68d 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -136,7 +136,10 @@ extern void parse_command_line(int argc, char *argv[])
list_destroy(params.clusters);
if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/sprio/opts.c b/src/sprio/opts.c
index f36086a7bfd..b2f49385af6 100644
--- a/src/sprio/opts.c
+++ b/src/sprio/opts.c
@@ -82,7 +82,11 @@ static void _opt_env(void)
if ((env_val = getenv("SLURM_CLUSTERS"))) {
if (!(params.clusters = slurmdb_get_info_cluster(env_val))) {
- error("'%s' invalid entry for SLURM_CLUSTERS", env_val);
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "SLURM_CLUSTERS. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
+ env_val);
exit(1);
}
}
@@ -142,7 +146,10 @@ parse_command_line( int argc, char* argv[] )
list_destroy(params.clusters);
if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index 3cc056fef97..c714941e3cf 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -131,7 +131,10 @@ parse_command_line( int argc, char* argv[] )
params.sort = xstrdup(env_val);
if ( ( env_val = getenv("SLURM_CLUSTERS") ) ) {
if (!(params.clusters = slurmdb_get_info_cluster(env_val))) {
- error("'%s' invalid entry for SLURM_CLUSTERS",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "SLURM_CLUSTERS. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
env_val);
exit(1);
}
@@ -183,7 +186,10 @@ parse_command_line( int argc, char* argv[] )
list_destroy(params.clusters);
if (!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/sshare/sshare.c b/src/sshare/sshare.c
index d599b9bd6b6..f9d131f832f 100644
--- a/src/sshare/sshare.c
+++ b/src/sshare/sshare.c
@@ -125,7 +125,10 @@ main (int argc, char *argv[])
list_destroy(clusters);
if(!(clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
diff --git a/src/strigger/opts.c b/src/strigger/opts.c
index 1e55a1bb03a..f3d16599582 100644
--- a/src/strigger/opts.c
+++ b/src/strigger/opts.c
@@ -215,7 +215,10 @@ extern void parse_command_line(int argc, char *argv[])
list_destroy(params.clusters);
if (!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
- error("'%s' invalid entry for --cluster",
+ error("'%s' can't be reached now, "
+ "or it is an invalid entry for "
+ "--cluster. Use 'sacctmgr --list "
+ "cluster' to see avaliable clusters.",
optarg);
exit(1);
}
--
GitLab