projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2620-keep-serialize-io' (closes #2620)
[arvados.git]
/
sdk
/
cli
/
bin
/
crunch-job
diff --git
a/sdk/cli/bin/crunch-job
b/sdk/cli/bin/crunch-job
index 25c1ee0857e521a898fe7711af01e44db7ee9ccf..48a6c9dea7f7f5be8fa20367e46e29de969f5b62 100755
(executable)
--- a/
sdk/cli/bin/crunch-job
+++ b/
sdk/cli/bin/crunch-job
@@
-95,6
+95,15
@@
$ENV{"CRUNCH_INSTALL"} = "$ENV{CRUNCH_TMP}/opt";
$ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
mkdir ($ENV{"JOB_WORK"});
$ENV{"CRUNCH_WORK"} = $ENV{"JOB_WORK"}; # deprecated
mkdir ($ENV{"JOB_WORK"});
+my $arv_cli;
+
+if (defined $ENV{"ARV_CLI"}) {
+ $arv_cli = $ENV{"ARV_CLI"};
+}
+else {
+ $arv_cli = 'arv';
+}
+
my $force_unlock;
my $git_dir;
my $jobspec;
my $force_unlock;
my $git_dir;
my $jobspec;
@@
-1074,7
+1083,7
@@
sub fetch_block
my $hash = shift;
my ($keep, $child_out, $output_block);
my $hash = shift;
my ($keep, $child_out, $output_block);
- my $cmd = "
arv
keep get \Q$hash\E";
+ my $cmd = "
$arv_cli
keep get \Q$hash\E";
open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
sysread($keep, $output_block, 64 * 1024 * 1024);
close $keep;
open($keep, '-|', $cmd) or die "fetch_block: $cmd: $!";
sysread($keep, $output_block, 64 * 1024 * 1024);
close $keep;
@@
-1086,7
+1095,7
@@
sub collate_output
Log (undef, "collate");
my ($child_out, $child_in);
Log (undef, "collate");
my ($child_out, $child_in);
- my $pid = open2($child_out, $child_in,
'arv'
, 'keep', 'put', '--raw');
+ my $pid = open2($child_out, $child_in,
$arv_cli
, 'keep', 'put', '--raw');
my $joboutput;
for (@jobstep)
{
my $joboutput;
for (@jobstep)
{
@@
-1236,7
+1245,7
@@
sub save_meta
return if $justcheckpoint; # checkpointing is not relevant post-Warehouse.pm
$local_logfile->flush;
return if $justcheckpoint; # checkpointing is not relevant post-Warehouse.pm
$local_logfile->flush;
- my $cmd = "
arv
keep put --filename ''\Q$keep_logfile\E "
+ my $cmd = "
$arv_cli
keep put --filename ''\Q$keep_logfile\E "
. quotemeta($local_logfile->filename);
my $loglocator = `$cmd`;
die "system $cmd failed: $?" if $?;
. quotemeta($local_logfile->filename);
my $loglocator = `$cmd`;
die "system $cmd failed: $?" if $?;