Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
381963a2
Commit
381963a2
authored
Feb 21, 2019
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add the "working" status to older Start/Restart/Reload, since still run
that code on the geni racks.
parent
8a134107
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
protogeni/lib/GeniAggregate.pm.in
protogeni/lib/GeniAggregate.pm.in
+13
-0
No files found.
protogeni/lib/GeniAggregate.pm.in
View file @
381963a2
...
...
@@ -333,6 +333,9 @@ sub GetCertificate($)
# An alias so that slivers look like aggregates.
sub resource_type($) { return field($_[0], "type"); }
# Busy if status is working (start/restart/stop/reload/reboot).
sub Working($) { return $_[0]->status eq "working" ? 1 : 0; }
# A place to stash a temporary rspec.
sub rspec($;$)
{
...
...
@@ -3058,6 +3061,8 @@ sub Stop($$;$)
# Clear last error.
$self->ClearBootFailure();
$self->SetErrorLog("");
# Set new status so ComputeState() knows what is going on.
$self->SetStatus("working");
my $experiment = Experiment->Lookup($self->slice_uuid());
if (!defined($experiment)) {
...
...
@@ -3180,10 +3185,18 @@ sub Stop($$;$)
$msg .= "Failed to stop the event system";
goto bad;
}
# Flip back to mixed to allow ComputeState to do its thing.
$self->SetStatus("mixed");
$self->ComputeState();
return 0;
bad:
$self->SetBootFailure();
if ($self->status() eq "working") {
# Flip back to mixed to allow ComputeState to do its thing.
$self->SetStatus("mixed");
$self->ComputeState();
}
if (defined($msg)) {
$self->SetErrorLog($msg);
print STDERR "$msg\n";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment