diff --git a/doc/haikus b/doc/haikus index 34aa6cd1..669c89ea 100644 --- a/doc/haikus +++ b/doc/haikus @@ -4,8 +4,8 @@ Quote of the month: - - + gnu parallel is amazing + -- Tarun Agarwal @axrawal --line-buffer, a flag parallel, now more precise diff --git a/doc/release_new_version b/doc/release_new_version index d7e44f1d..fd494b37 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -273,7 +273,7 @@ from:tange@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org stable-bcc: Jesse Alama -Subject: GNU Parallel 20240522 ('Raisi-IRAN preæsentdt/Tbilisi/Georgia/Eurovision') released +Subject: GNU Parallel 20240622 ('34 counts/(Raisi-IRAN preæsentdt)/spurlock(supersize)') released GNU Parallel 20240122 ('Frederik X') has been released. It is available for download at: lbry://@GnuParallel:4 diff --git a/src/env_parallel.ash b/src/env_parallel.ash index 68efa9ee..98e4b9c2 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.bash b/src/env_parallel.bash index a6c6f004..20da70ea 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -605,7 +605,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.dash b/src/env_parallel.dash index c200499a..e76b8251 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh index afc139fc..619d3ad3 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.mksh b/src/env_parallel.mksh index d736f1b4..6e5b3b7e 100644 --- a/src/env_parallel.mksh +++ b/src/env_parallel.mksh @@ -570,7 +570,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.sh b/src/env_parallel.sh index c3bdfb58..b2f06118 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh index c438c438..004fe0b5 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240522 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240523 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/niceload b/src/niceload index 3d69c13a..54f8adb7 100755 --- a/src/niceload +++ b/src/niceload @@ -26,7 +26,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20240522; +$Global::version = 20240523; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index ab768170..ea93c793 100755 --- a/src/parallel +++ b/src/parallel @@ -2794,7 +2794,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20240522; + $Global::version = 20240523; $Global::progname = 'parallel'; $::name = "GNU Parallel"; $Global::infinity = 2**31; @@ -7723,9 +7723,9 @@ sub limit($) { limit=$1; io_file=$2; # Do the measurement in the background - ((tmp=$(tempfile); - LANG=C iostat -x 1 2 > $tmp; - mv $tmp $io_file) /dev/null & ); + ((tmp=$(mktemp || tempfile); + LANG=C iostat -x 1 2 > $tmp; + mv $tmp $io_file) /dev/null & ); perl -e '-e $ARGV[0] or exit(1); for(reverse <>) { /Device/ and last; @@ -7772,7 +7772,6 @@ sub limit($) { local %ENV = %env; $ENV{'SSHLOGIN'} = $self->string(); system($Global::shell,"-c",$self->{'limitscript'}); - #::qqx($self->{'limitscript'}); ::debug("limit","limit `".$self->{'limitscript'}."` result ".($?>>8)."\n"); return $?>>8; } @@ -11340,17 +11339,17 @@ sub set_job_in_joblog($) { vec($Global::job_already_run,$job->seq(),1) = 1; } - sub retry() { - # This command should be retried - my $self = shift; +sub retry() { + # This command should be retried + my $self = shift; - $self->set_endtime(undef); - $self->reset_exitstatus(); - $self->set_killreason(undef); - $Global::JobQueue->unget($self); - ::debug("run", "Retry ", $self->seq(), "\n"); - return 1; - } + $self->set_endtime(undef); + $self->reset_exitstatus(); + $self->set_killreason(undef); + $Global::JobQueue->unget($self); + ::debug("run", "Retry ", $self->seq(), "\n"); + return 1; +} sub should_be_retried($) { # Should this job be retried? diff --git a/src/parallel.pod b/src/parallel.pod index 231ae767..1ba785ea 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -3130,13 +3130,15 @@ The jobs will be run on a list of remote computers. =item Z<> @I/ -One or more groups this sshlogin belongs to (See -B<--hostgroup>). Multiple groups are separated by '+'. The I -will always be added to a hostgroup named the same as I. +One or more groups this sshlogin belongs to. Multiple groups are +separated by '+'. The I will always be added to a hostgroup +named the same as I. If only the I<@hostgroup> is given, only the sshlogins in that hostgroup will be used. Multiple I<@hostgroup> can be given. +See B<--hostgroup>. + Examples: B<@prod/>, B<@dev+remote/> @@ -3170,17 +3172,18 @@ Examples: B, B =item Z<> :I Use I for authentication (using B). B -cannot contain space. If I is omitted use B<$SSHPASS>. If -B<:> is omitted use B's default authentication. In this case -login must not require a password (B and B may -help with that). +cannot contain space. If I is omitted, GNU B will +use B<$SSHPASS>. If B<:> is omitted use B's default +authentication. In this case login must not require a password +(B and B may help with that). Examples: B<:mypassword>, B<:> =item Z<> I -Hostname or IP address of server. +Hostname or IP address of server. (This is what you will use the +most). Examples: B, B<10.1.2.3>, B<[2001:470:142:4::a]>, B<2001:470:142:5::116>. diff --git a/src/parsort b/src/parsort index 720d0a57..e6765cc6 100755 --- a/src/parsort +++ b/src/parsort @@ -137,7 +137,7 @@ GetOptions( "help" => \$opt::dummy, ) || exit(255); $Global::progname = ($0 =~ m:(^|/)([^/]+)$:)[1]; -$Global::version = 20240522; +$Global::version = 20240523; if($opt::version) { version(); exit 0; } # Remove -D and --parallel=N my @s = (grep { ! /^-D$|^--parallel=\S+$/ } diff --git a/src/sql b/src/sql index 7a61b56d..f5dda13f 100755 --- a/src/sql +++ b/src/sql @@ -670,7 +670,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20240522; + $Global::version = 20240523; $Global::progname = 'sql'; # This must be done first as this may exec myself