From 5e8e5db84ea301e489eadc7cae1a145b03573e19 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 22 Mar 2021 17:43:55 +0100 Subject: [PATCH 1/3] Revert "web: Add column daemon_flags" This reverts commit 278ee8ae3664928510b4d738dd70a053e6a24e5b. We remove the --exclusive feature of mxqd. --- web/pages/mxq/mxq.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index 4139a4e6..40f4ba87 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -834,7 +834,7 @@ sub server() { daemon_memory_limit_slot_soft daemon_memory_limit_slot_hard daemon_jobs_running daemon_slots_running daemon_threads_running daemon_memory_used - mtime daemon_start daemon_stop daemon_flags + mtime daemon_start daemon_stop ); my $sth=$dbh->prepare('SELECT '.join(',',@cols).' FROM mxq_daemon WHERE status<=200 ORDER BY hostname,daemon_name'); @@ -864,7 +864,6 @@ sub server() { # 'mtime', # 'start', # 'stop', - 'F' ])); my %S; @@ -875,7 +874,7 @@ sub server() { $daemon_memory_limit_slot_soft,$daemon_memory_limit_slot_hard, $daemon_jobs_running,$daemon_slots_running, $daemon_threads_running,$daemon_memory_used, - $mtime,$daemon_start,$daemon_stop,$daemon_flags + $mtime,$daemon_start,$daemon_stop ) = @$row; $hostname =~s/\.molgen\.mpg\.de$//; @@ -909,19 +908,18 @@ sub server() { # $q->td($mtime), # $q->td($daemon_start), # $q->td($daemon_stop), - $q->td($daemon_flags ? 'X' : ' ' ), ); } map { - $out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' ')); + $out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),$q->td(' '),); } keys %{$dead_hosts}; - $out.=$q->Tr($q->td({colspan=>15},' ')); + $out.=$q->Tr($q->td({colspan=>14},' ')); my $dist = join(', ',map {"$S{daemon_slots_dist}->{$_}x$_"} sort {$b <=> $a} keys %{$S{daemon_slots_dist}}); $out.=$q->Tr( $q->td({class=>'center', colspan=>3},$S{servers}.' servers'),$q->td($dist), $q->td({class=>'center', colspan=>3},$S{daemon_slots}.' cores'),$q->td({class=>'number'},size($S{daemon_memory_sum}*1000**2)),$q->td(' '),$q->td(' '),$q->td(' '), - $q->td({class=>'number'},$S{daemon_slots_running}),$q->td(' '),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),$q->td(' ')); + $q->td({class=>'number'},$S{daemon_slots_running}),$q->td(' '),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),); $out.=''; return $out; From 77a18090c5190d6c754919799effd88706c15f8a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 22 Mar 2021 17:49:07 +0100 Subject: [PATCH 2/3] mxqd: Remove --exclusive Remove --exclusive option. We leave the now unused daemon_flags in place, but they will always be 0 because of `memset(server, 0, ...)` in server_init(). --- mxqd.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mxqd.c b/mxqd.c index efa864d9..02c1f1d3 100644 --- a/mxqd.c +++ b/mxqd.c @@ -102,7 +102,6 @@ static void print_usage(void) " --debug default: info log level\n" "\n" " --recover-only (recover from crash and exit)\n" - " --exclusive run in exclusive mode\n" "\n" " --initial-path default: %s\n" " --initial-tmpdir default: %s\n" @@ -442,7 +441,6 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) char arg_daemonize = 0; char arg_nolog = 0; char arg_recoveronly = 0; - int arg_exclusive = 0; char *str_bootid; int opt; unsigned long arg_threads_total = 0; @@ -480,7 +478,6 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) MX_OPTION_OPTIONAL_ARG("mysql-default-file", 'M'), MX_OPTION_OPTIONAL_ARG("mysql-default-group", 'S'), MX_OPTION_OPTIONAL_ARG("max-time", 't'), - MX_OPTION_NO_ARG("exclusive", 11), MX_OPTION_END }; @@ -634,10 +631,6 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) return -EX_USAGE; } break; - - case 11: - arg_exclusive = 1; - break; } } @@ -819,7 +812,6 @@ int server_init(struct mxq_server *server, int argc, char *argv[]) daemon->daemon_maxtime = server->maxtime; daemon->daemon_memory_limit_slot_soft = server->memory_limit_slot_soft; daemon->daemon_memory_limit_slot_hard = server->memory_limit_slot_hard; - daemon->daemon_flags = arg_exclusive; server->prerequisites=keywordset_new("true"); keywordset_add(server->prerequisites, server->hostname); From 7733bebeb64725df1d27f92f0ed664177a279d8a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 22 Mar 2021 17:53:49 +0100 Subject: [PATCH 3/3] mxqd_control: Remove --exclusive mode Remove consideration of the obsoleted --exclusive daemon mode. --- mxqd_control.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mxqd_control.c b/mxqd_control.c index e6319549..573a534e 100644 --- a/mxqd_control.c +++ b/mxqd_control.c @@ -12,9 +12,6 @@ static int server_is_qualified(struct mxq_server *server, struct mxq_group *group) { - /* server in exclusive mode and no whitelist on group ? */ - if ( server->daemon.daemon_flags && *group->group_whitelist == 0 ) - return 0; if (*group->group_whitelist != 0) { _mx_cleanup_(keywordset_free_byref) struct keywordset *kws = keywordset_new(group->group_whitelist); if (! (keywordset_ismember(kws, server->hostname_short) || keywordset_ismember(kws, server->hostname)))