Fixed bug #43567: --env + --filter_hosts + function fails

src/niceload.pod

@@ -7,7 +7,8 @@ niceload - slow down a program when the load average is above a certain limit
 =head1 SYNOPSIS
 
 B<niceload> [-v] [-h] [-n nice] [-I io] [-L load] [-M mem] [-N]
-[--sensor program] [-t time] [-s time|-f factor] ( command | -p PID [-p PID ...] )
+[--sensor program] [-t time] [-s time|-f factor]
+( command | -p PID [-p PID ...] | --prg program )
 
 
 =head1 DESCRIPTION
@@ -31,6 +32,13 @@ run 1 second, suspend (3.00-1.00) seconds, run 1 second, suspend
 
 =over 9
 
+=item B<-B> (alpha testing)
+
+=item B<--battery> (alpha testing)
+
+Suspend if the system is running on battery. Short hand for: -l -1 --sensor 'cat /sys/class/power_supply/BAT0/status /proc/acpi/battery/BAT0/state 2>/dev/null |grep -i -q discharging; echo $?'
+
+
 =item B<-f> I<FACTOR>
 
 =item B<--factor> I<FACTOR>

src/parallel

@@ -2372,15 +2372,16 @@ sub cleanup_basefile {
 
 sub filter_hosts {
     my(@cores, @cpus, @maxline, @echo);
+    my $envvar = ::shell_quote_scalar($Global::envvar);
     while (my ($host, $sshlogin) = each %Global::host) {
 	if($host eq ":") { next }
 	# The 'true' is used to get the $host out later
 	my $sshcmd = "true $host;" . $sshlogin->sshcommand()." ".$sshlogin->serverlogin();
-	push(@cores, $host."\t".$sshcmd." ".$Global::envvar." parallel --number-of-cores\n");
-	push(@cpus, $host."\t".$sshcmd." ".$Global::envvar." parallel --number-of-cpus\n");
-	push(@maxline, $host."\t".$sshcmd." ".$Global::envvar." parallel --max-line-length-allowed\n");
+	push(@cores, $host."\t".$sshcmd." ".$envvar." parallel --number-of-cores\n\0");
+	push(@cpus, $host."\t".$sshcmd." ".$envvar." parallel --number-of-cpus\n\0");
+	push(@maxline, $host."\t".$sshcmd." ".$envvar." parallel --max-line-length-allowed\n\0");
 	# 'echo' is used to get the best possible value for an ssh login time
-	push(@echo, $host."\t".$sshcmd." echo\n");
+	push(@echo, $host."\t".$sshcmd." echo\n\0");
     }
     my ($fh, $tmpfile) = ::tmpfile(SUFFIX => ".ssh");
     print $fh @cores, @cpus, @maxline, @echo;
@@ -2391,11 +2392,20 @@ sub filter_hosts {
     #              will make it less likely to overload the ssh daemon.
     # --retries 3: If the ssh daemon it overloaded, try 3 times
     # -s 16000: Half of the max line on UnixWare
-    my $cmd = "cat $tmpfile | $0 -j0 --timeout 5 -s 16000 --joblog - --plain --delay 0.1 --retries 3 --tag --tagstring {1} --colsep '\t' -k eval {2} 2>/dev/null";
+    my $cmd = "cat $tmpfile | $0 -j0 --timeout 5 -s 16000 --joblog - --plain --delay 0.1 --retries 3 --tag --tagstring {1} -0 --colsep '\t' -k eval {2} 2>/dev/null";
     ::debug("init", $cmd, "\n");
     open(my $host_fh, "-|", $cmd) || ::die_bug("parallel host check: $cmd");
     my (%ncores, %ncpus, %time_to_login, %maxlen, %echo, @down_hosts);
+    my $prepend = "";
     while(<$host_fh>) {
+	if(/\'$/) {
+	    # if last char = ' then append next line
+	    # This may be due to quoting of $Global::envvar
+	    $prepend .= $_;
+	    next;
+	}
+	$_ = $prepend . $_;
+	$prepend = "";
 	chomp;
 	my @col = split /\t/, $_;
 	if(defined $col[6]) {

testsuite/tests-to-run/niceload03.sh

@@ -9,16 +9,17 @@ int() {
 export -f int
 
 cat <<'EOF' | stdout parallel -k -vj0 -L1
-# The seq 10000000 should take > 1 cpu sec to run.
+# The seq 30000000 should take > 1 cpu sec to run.
 echo '### --soft -f and test if child is actually suspended and thus takes longer'
-  niceload --soft -f 0.5 'seq 20000000 | wc;echo This should finish last' & 
-  (sleep 1; seq 20000000 | wc;echo This should finish first) & 
+  niceload --soft -f 0.5 'seq 30000000 | nice wc;echo This should finish last' & 
+  (sleep 1; seq 30000000 | nice wc;echo This should finish first) & 
   wait
 
 echo '### niceload with no arguments should give no output'
   niceload
 
 echo '### Test -t and -s'
+  # This should sleep 2*1s and run 2*2s
   niceload -v -t 1 -s 2 sleep 4.5
 
 echo 'bug #38908: niceload: Ctrl-C/TERM should resume jobs if using -p - Order may change, but not output'

testsuite/tests-to-run/parallel-local-ssh1.sh

@@ -15,13 +15,13 @@ echo '### Stop if all hosts are filtered and there are no hosts left to run on'
 
 echo '### bug #41805: Idea: propagate --env for parallel --number-of-cores'
   echo '** test_zsh'
-  FOO=test_zsh parallel --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_zsh parallel --env FOO,HOME -S zsh@lo env ::: "" |sort|egrep 'FOO|^HOME'
   echo '** test_zsh_filter'
-  FOO=test_zsh_filter parallel --filter-hosts --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_zsh_filter parallel --filter-hosts --env FOO,HOME -S zsh@lo env ::: "" |sort|egrep 'FOO|^HOME'
   echo '** test_csh'
-  FOO=test_csh parallel --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_csh parallel --env FOO,HOME -S csh@lo env ::: "" |sort|egrep 'FOO|^HOME'
   echo '** test_csh_filter'
-  FOO=test_csh_filter parallel --filter-hosts --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_csh_filter parallel --filter-hosts --env FOO,HOME -S csh@lo env ::: "" |sort|egrep 'FOO|^HOME'
   echo '** bug #41805 done'
 
 echo '### Deal with long command lines on remote servers'

testsuite/wanted-results/niceload03

@@ -1,16 +1,17 @@
-# The seq 10000000 should take > 1 cpu sec to run.
+# The seq 30000000 should take > 1 cpu sec to run.
 echo '### --soft -f and test if child is actually suspended and thus takes longer'
 ### --soft -f and test if child is actually suspended and thus takes longer
-  niceload --soft -f 0.5 'seq 20000000 | wc;echo This should finish last' &   (sleep 1; seq 20000000 | wc;echo This should finish first) &   wait
-20000000 20000000 168888897
+  niceload --soft -f 0.5 'seq 30000000 | nice wc;echo This should finish last' &   (sleep 1; seq 30000000 | nice wc;echo This should finish first) &   wait
+30000000 30000000 258888897
 This should finish first
-20000000 20000000 168888897
+30000000 30000000 258888897
 This should finish last
 echo '### niceload with no arguments should give no output'
 ### niceload with no arguments should give no output
   niceload
 echo '### Test -t and -s'
 ### Test -t and -s
+  # This should sleep 2*1s and run 2*2s
   niceload -v -t 1 -s 2 sleep 4.5
 Sleeping 1s
 Running 2s

testsuite/wanted-results/parallel-local-ssh1

@@ -12,24 +12,24 @@ echo '### bug #41805: Idea: propagate --env for parallel --number-of-cores'
 ### bug #41805: Idea: propagate --env for parallel --number-of-cores
   echo '** test_zsh'
 ** test_zsh
-  FOO=test_zsh parallel --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_zsh parallel --env FOO,HOME -S zsh@lo env ::: "" |sort|egrep 'FOO|^HOME'
 FOO=test_zsh
-PATH=/home/tange/bin:/home/tange/bin:/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin
+HOME=/home/tange
   echo '** test_zsh_filter'
 ** test_zsh_filter
-  FOO=test_zsh_filter parallel --filter-hosts --env FOO,PATH -S zsh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_zsh_filter parallel --filter-hosts --env FOO,HOME -S zsh@lo env ::: "" |sort|egrep 'FOO|^HOME'
 FOO=test_zsh_filter
-PATH=/home/tange/bin:/home/tange/bin:/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin
+HOME=/home/tange
   echo '** test_csh'
 ** test_csh
-  FOO=test_csh parallel --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_csh parallel --env FOO,HOME -S csh@lo env ::: "" |sort|egrep 'FOO|^HOME'
 FOO=test_csh
-PATH=/home/tange/bin:/home/tange/bin:/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin
+HOME=/home/tange
   echo '** test_csh_filter'
 ** test_csh_filter
-  FOO=test_csh_filter parallel --filter-hosts --env FOO,PATH -S csh@lo env ::: "" |sort|egrep 'FOO|PATH'
+  FOO=test_csh_filter parallel --filter-hosts --env FOO,HOME -S csh@lo env ::: "" |sort|egrep 'FOO|^HOME'
 FOO=test_csh_filter
-PATH=/home/tange/bin:/home/tange/bin:/home/tange/bin:/home/tange/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/home/tange/terminals/data-import:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin:/home/tange/bin:/sbin:/usr/sbin:/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin
+HOME=/home/tange
   echo '** bug #41805 done'
 ** bug #41805 done
 echo '### Deal with long command lines on remote servers'