Commit e3f94313 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Very temporary patch for the image type problem at Utah Cloudlab:

If the metadata does not include an architecture then we fall back to
old method of allowing imported image to run on all local node
types. This works pretty all the time on all clusters, but not on
Cloudlab Utah which has ARM and X96 nodes. So for now, I have pushed out
a change to all our clusters that forces an architecture into the
metadata, based on the fact that if the local testbed does not have any
m400 nodes, then the image is 99.9 percent certain to be x86_64.

I will think about a proper solution on the way to Italy.
parent 4a668e80
......@@ -55,6 +55,7 @@ my $TBBASE = "@TBBASE@";
my $PGENISUPPORT= @PROTOGENI_SUPPORT@;
my $OURDOMAIN = "@OURDOMAIN@";
my $WITHPROVENANCE= @IMAGEPROVENANCE@;
my $MAINSITE = @TBMAINSITE@;
#
# When fetching the metadata, we now tell the server what client
......@@ -84,6 +85,7 @@ use User;
use Project;
use Image;
use OSinfo;
use NodeType;
use EmulabFeatures;
$EmulabFeatures::verbose = 0;
......@@ -240,6 +242,21 @@ sub DumpImage($)
if ($image->architecture()) {
$xmlfields{'architecture'} = $image->architecture();
}
else {
#
# Temporary patch for importing images into the Cloudlab
# Utah, which is the only multi-architecture cluster. If
# we do not give it an architecture, then it will assign
# all types to the image, and that definitely wrong. So
# lets just assume that if the cluster does not have any
# m400 node types, its an x86 image. And if the importing
# cluster is not using architectures, this will be ignored
# anyway.
#
if ($MAINSITE || !defined(NodeType->Lookup("m400"))) {
$xmlfields{'architecture'} = "x86_64";
}
}
#
# Send along the history so that the caller can get all
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment