Merge pull request #94 from mariux64/remove-exclusive-mode

Remove exclusive mode
mariux64 · Mar 23, 2021 · e6aaa92 · e6aaa92
2 parents b435c9b + 7733beb
commit e6aaa92
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git 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 <path>         default: %s\n"
     "      --initial-tmpdir <directory>  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);

diff --git 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)))

diff --git 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' : '&nbsp;' ),
 		);
 	}
 	map {
-		$out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'));
+		$out.=$q->Tr( $q->td(0),$q->td('-'),$q->td('no mxqd'),$q->td($_),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),);
 	} keys %{$dead_hosts};
 
-	$out.=$q->Tr($q->td({colspan=>15},'&nbsp;'));
+	$out.=$q->Tr($q->td({colspan=>14},'&nbsp;'));
 	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('&nbsp;'),$q->td('&nbsp;'),$q->td('&nbsp;'),
-		$q->td({class=>'number'},$S{daemon_slots_running}),$q->td('&nbsp;'),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),$q->td('&nbsp;'));
+		$q->td({class=>'number'},$S{daemon_slots_running}),$q->td('&nbsp;'),$q->td({class=>'number'},size($S{daemon_memory_used_sum}*1000**2)),);
 
 	$out.='</table>';
 	return $out;