if ($build_script)
{
$build_script_to_send = $build_script;
+ $command .=
+ "&& perl -";
}
$command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
if ($docker_hash)
$command .=
q{$(ip -o address show scope global |
gawk 'match($4, /^([0-9\.:]+)\//, x){print "--dns", x[1]}') };
+ $command .= "--volume=\Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
$command .= "--volume=\Q$ENV{TASK_KEEPMOUNT}:/keep:ro\E ";
$command .= "--env=\QHOME=/home/crunch\E ";
while (my ($env_key, $env_val) = each %ENV)
{
if ($env_key =~ /^(ARVADOS|JOB|TASK)_/) {
- if ($env_key eq "TASK_KEEPMOUNT") {
+ if ($env_key eq "TASK_WORK") {
+ $command .= "--env=\QTASK_WORK=/tmp/crunch-job\E ";
+ }
+ elsif ($env_key eq "TASK_KEEPMOUNT") {
$command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
}
else {
$command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
$command .= "\Q$docker_hash\E ";
$command .= "stdbuf --output=0 --error=0 ";
- $command .= "perl - ";
$command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
} else {
# Non-docker run
$command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
$command .= "stdbuf --output=0 --error=0 ";
- $command .= "perl - ";
$command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
}
eval {
open(my $orig_manifest, '-|', 'arv-get', $collated_output)
or die "failed to get collated manifest: $!";
- # Read the original manifest, and strip permission hints from it,
- # so we can put the result in a Collection.
- my @stripped_manifest_lines = ();
my $orig_manifest_text = '';
while (my $manifest_line = <$orig_manifest>) {
$orig_manifest_text .= $manifest_line;
- my @words = split(/ /, $manifest_line, -1);
- foreach my $ii (0..$#words) {
- if ($words[$ii] =~ /^[0-9a-f]{32}\+/) {
- $words[$ii] =~ s/\+A[0-9a-f]{40}@[0-9a-f]{8}\b//;
- }
- }
- push(@stripped_manifest_lines, join(" ", @words));
}
- my $stripped_manifest_text = join("", @stripped_manifest_lines);
my $output = $arv->{'collections'}->{'create'}->execute('collection' => {
- 'uuid' => md5_hex($stripped_manifest_text),
'manifest_text' => $orig_manifest_text,
});
- Log(undef, "output " . $output->{uuid});
- $Job->update_attributes('output' => $output->{uuid}) if $job_has_uuid;
- if ($Job->{'output_is_persistent'}) {
- $arv->{'links'}->{'create'}->execute('link' => {
- 'tail_kind' => 'arvados#user',
- 'tail_uuid' => $User->{'uuid'},
- 'head_kind' => 'arvados#collection',
- 'head_uuid' => $Job->{'output'},
- 'link_class' => 'resources',
- 'name' => 'wants',
- });
- }
+ Log(undef, "output uuid " . $output->{uuid});
+ Log(undef, "output hash " . $output->{portable_data_hash});
+ $Job->update_attributes('output' => $output->{portable_data_hash}) if $job_has_uuid;
};
if ($@) {
Log (undef, "Failed to register output manifest: $@");
return if $justcheckpoint; # checkpointing is not relevant post-Warehouse.pm
$local_logfile->flush;
- my $cmd = "arv-put --filename ''\Q$keep_logfile\E "
+ my $cmd = "arv-put --portable-data-hash --filename ''\Q$keep_logfile\E "
. quotemeta($local_logfile->filename);
my $loglocator = `$cmd`;
die "system $cmd failed: $?" if $?;
# If so, return its stream name and Docker hash.
# If not, return undef for both values.
my $locator = shift;
+ my ($streamname, $filename);
if (my $image = $arv->{collections}->{get}->execute(uuid => $locator)) {
- my @file_list = @{$image->{files}};
- if ((scalar(@file_list) == 1) &&
- ($file_list[0][1] =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
- return ($file_list[0][0], $1);
+ foreach my $line (split(/\n/, $image->{manifest_text})) {
+ my @tokens = split(/\s+/, $line);
+ next if (!@tokens);
+ $streamname = shift(@tokens);
+ foreach my $filedata (grep(/^\d+:\d+:/, @tokens)) {
+ if (defined($filename)) {
+ return (undef, undef); # More than one file in the Collection.
+ } else {
+ $filename = (split(/:/, $filedata, 3))[2];
+ }
+ }
}
}
- return (undef, undef);
+ if (defined($filename) and ($filename =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
+ return ($streamname, $1);
+ } else {
+ return (undef, undef);
+ }
}
__DATA__
open L, ">", "$destdir.lock" or die "$destdir.lock: $!";
flock L, LOCK_EX;
if (readlink ("$destdir.commit") eq $commit && -d $destdir) {
- exit 0;
+ if (@ARGV) {
+ exec(@ARGV);
+ die "Cannot exec `@ARGV`: $!";
+ } else {
+ exit 0;
+ }
}
unlink "$destdir.commit";
if (@ARGV) {
exec(@ARGV);
+ die "Cannot exec `@ARGV`: $!";
} else {
exit 0;
}