Commit 6bc5c3fb authored by Leigh B Stoller's avatar Leigh B Stoller

Turn off NFS mounts (via nodes table) for xen shared VMs in Utah.

(Do not work cause of firewalling, and they timeout, which takes
too long).
parent a7e51825
...@@ -1660,7 +1660,8 @@ sub ClearBootAttributes($) ...@@ -1660,7 +1660,8 @@ sub ClearBootAttributes($)
"update_accounts=0,ipport_next=ipport_low,rtabid=0, ". "update_accounts=0,ipport_next=ipport_low,rtabid=0, ".
"sfshostid=NULL,allocstate='$allocFreeState',boot_errno=0, ". "sfshostid=NULL,allocstate='$allocFreeState',boot_errno=0, ".
"destination_x=NULL,destination_y=NULL, ". "destination_x=NULL,destination_y=NULL, ".
"destination_orientation=NULL,reserved_memory=0 ". "destination_orientation=NULL,reserved_memory=0,".
"nonfsmounts=0 ".
"where node_id='$node_id'") "where node_id='$node_id'")
or return -1; or return -1;
...@@ -3234,6 +3235,24 @@ sub Setrtabid($$) ...@@ -3234,6 +3235,24 @@ sub Setrtabid($$)
return Refresh($self); return Refresh($self);
} }
#
# Set nonfsmounts for a node.
#
sub NoNFSMounts($)
{
my ($self) = @_;
return -1
if (! (ref($self)));
my $node_id = $self->node_id();
DBQueryWarn("update nodes set nonfsmounts='1' where node_id='$node_id'")
or return -1;
return 0;
}
# #
# Get the max share count for a node. This is actually the pcvm count # Get the max share count for a node. This is actually the pcvm count
# from the aux table, but might change someday, I hope. # from the aux table, but might change someday, I hope.
......
...@@ -3210,6 +3210,16 @@ sub SliverWorkAux($$$$$$$$) ...@@ -3210,6 +3210,16 @@ sub SliverWorkAux($$$$$$$$)
# Must do this after mapper has run # Must do this after mapper has run
$node->Refresh(); $node->Refresh();
if ($MAINSITE && $node->sharing_mode()) {
my $physhost = $node->GetPhysHost();
if (defined($physhost)) {
my ($osinfo) = $physhost->RunningOsImage();
if (defined($osinfo) && $osinfo->FeatureSupported("xen-host")){
$node->NoNFSMounts();
}
}
}
if (grep {$_ eq $virtual_id} keys(%nodemap)) { if (grep {$_ eq $virtual_id} keys(%nodemap)) {
# #
# Already in the aggregate, so reuse sliver. # Already in the aggregate, so reuse sliver.
......
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