Commit 6a09dc9a authored by David Johnson's avatar David Johnson

Do vnode ops in sorted order.

parent 328b9c35
...@@ -322,7 +322,7 @@ if ($action eq 'reboot' || $action eq 'halt') { ...@@ -322,7 +322,7 @@ if ($action eq 'reboot' || $action eq 'halt') {
@vnodes = keys(%vndb); @vnodes = keys(%vndb);
} }
foreach my $vnode (@vnodes) { foreach my $vnode (sort(@vnodes)) {
if (!exists($vndb{$vnode}) || !exists($vndb{$vnode}{'type'})) { if (!exists($vndb{$vnode}) || !exists($vndb{$vnode}{'type'})) {
# this is a node that is not fully configured according to the db. # this is a node that is not fully configured according to the db.
# we only make noise if it is one of the ones the user asked for. # we only make noise if it is one of the ones the user asked for.
...@@ -347,7 +347,7 @@ elsif ($action eq 'kill') { ...@@ -347,7 +347,7 @@ elsif ($action eq 'kill') {
@vnodes = keys(%vndb); @vnodes = keys(%vndb);
} }
foreach my $vnode (@vnodes) { foreach my $vnode (sort(@vnodes)) {
if (!exists($vndb{$vnode}) || !exists($vndb{$vnode}{'type'})) { if (!exists($vndb{$vnode}) || !exists($vndb{$vnode}{'type'})) {
# this is a node that is not fully configured according to the db. # this is a node that is not fully configured according to the db.
# we only make noise if it is one of the ones the user asked for. # we only make noise if it is one of the ones the user asked for.
...@@ -440,7 +440,7 @@ elsif ($action eq 'boot') { ...@@ -440,7 +440,7 @@ elsif ($action eq 'boot') {
TBDebugTimeStamp("finished $vmtype rootPreConfigNetwork") TBDebugTimeStamp("finished $vmtype rootPreConfigNetwork")
if ($debug); if ($debug);
foreach my $vnode (@newvnodes) { foreach my $vnode (sort(@newvnodes)) {
my ($ret,$err); my ($ret,$err);
# #
...@@ -493,7 +493,7 @@ elsif ($action eq 'boot') { ...@@ -493,7 +493,7 @@ elsif ($action eq 'boot') {
} }
if ($reconfig) { if ($reconfig) {
foreach my $vnode (@oldvnodes) { foreach my $vnode (sort(@oldvnodes)) {
my $vmid = $vndb{$vnode}{'id'}; my $vmid = $vndb{$vnode}{'id'};
my ($ret,$err); my ($ret,$err);
...@@ -540,7 +540,7 @@ elsif ($action eq 'boot') { ...@@ -540,7 +540,7 @@ elsif ($action eq 'boot') {
} }
} }
foreach my $vnode (@newvnodes,@oldvnodes) { foreach my $vnode (sort(@newvnodes,@oldvnodes)) {
my $vmid = $vndb{$vnode}{'id'}; my $vmid = $vndb{$vnode}{'id'};
next if (safeLibOp($vnode,'vnodeBoot',1,1,$vnode,$vmid)); next if (safeLibOp($vnode,'vnodeBoot',1,1,$vnode,$vmid));
...@@ -572,7 +572,7 @@ exit(0); ...@@ -572,7 +572,7 @@ exit(0);
sub teardownOldVnodes() { sub teardownOldVnodes() {
print "Looking for old vnodes to tear down...\n"; print "Looking for old vnodes to tear down...\n";
foreach my $oldvnode (keys(%vndb)) { foreach my $oldvnode (sort(keys(%vndb))) {
my $found = 0; my $found = 0;
foreach my $curvnode (@tmccvnodes) { foreach my $curvnode (@tmccvnodes) {
if ($curvnode eq $oldvnode) { if ($curvnode eq $oldvnode) {
......
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