From d698958921dc4c6b657b09e3fadd6e1f3226e28b Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Tue, 9 Nov 2010 13:07:45 -0700
Subject: [PATCH] When releasing ticket nodes, make sure that we release vhosts
 when all the of the virtual nodes on the vhost are gone. We were hanging onto
 vhosts for longer then necessary.

---
 protogeni/lib/GeniTicket.pm.in | 53 ++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/protogeni/lib/GeniTicket.pm.in b/protogeni/lib/GeniTicket.pm.in
index 1826dc692..d90dfcd33 100755
--- a/protogeni/lib/GeniTicket.pm.in
+++ b/protogeni/lib/GeniTicket.pm.in
@@ -777,6 +777,7 @@ sub Release($$)
     my $eid     = $experiment->eid();
     my @nodeids = ();
     my @nodes   = ();
+    my @vhosts  = ();
 
     foreach my $ref (GeniXML::FindNodes("n:node",
 					$self->rspec())->get_nodelist()) {
@@ -795,7 +796,6 @@ sub Release($$)
 	    return -1;
 	}
 
-	# Virtual nodes not created until ticket redeemed.
 	my $node = GeniUtil::LookupNode($resource_id);
 	next
 	    if (!defined($node));
@@ -804,10 +804,6 @@ sub Release($$)
 	next
 	    if (!defined($reservation));
 
-	# Watch for duplicates, as in multiple vnodes on a pnode.
-	next
-	    if (grep {$_ eq $node->node_id()} @nodeids);
-
 	#
 	# If the node is still in the experiment and not incorporated,
 	# release it. genisliver_idx is not defined until ticket redeemed.
@@ -819,6 +815,13 @@ sub Release($$)
 		 $restable->{'genisliver_idx'} == 0)) {
 		push(@nodeids, $node->node_id());
 		push(@nodes, $node);
+
+		# So we can tell if we need to deallocate a physical
+		# host once all the VMs on it are gone. 
+		if ($node->isvirtnode() && !$node->sharing_mode()) {
+		    push(@vhosts, $node->phys_nodeid())
+			if (! grep {$_ eq $node->phys_nodeid()} @vhosts);
+		}
 	    }
 	}
     }
@@ -828,10 +831,50 @@ sub Release($$)
 	#
 	#system("export NORELOAD=1; $NFREE -x -q $pid $eid @nodeids");
 	system("$NFREE -x -q $pid $eid @nodeids");
+	return -1
+	    if ($?);
+    }
+    foreach my $node (@nodes) {
+	$node->Refresh();
+    }
+
+    @nodes = @nodeids = ();
+    #
+    # Now go through the vhosts that belong to us, and see if we can
+    # free them cause there are no longer VMs on them.
+    #
+    foreach my $pnode_id (@vhosts) {
+	my $pnode = Node->Lookup($pnode_id);
+	if (!defined($pnode)) {
+	    print STDERR "ReleaseTicket: *** No such pnode $pnode_id\n";
+	    next;
+	}
+	
+	my $reservation = $pnode->Reservation();
+	next
+	    if (!defined($reservation) ||
+		!$reservation->SameExperiment($experiment));
+	
+	my @vnodes = ();
+	if ($pnode->VirtualNodes(\@vnodes) != 0) {
+	    print STDERR
+		"ReleaseTicket: *** Could not get vnode list for $pnode_id\n";
+	    return -1;
+	}
+	if (!@vnodes) {
+	    push(@nodeids, $pnode->node_id());
+	    push(@nodes, $pnode);
+	}
+    }
+    if (@nodeids) {
+	system("$NFREE -x -q $pid $eid @nodeids");
+	return -1
+	    if ($?);
     }
     foreach my $node (@nodes) {
 	$node->Refresh();
     }
+    
     $self->Delete($flag);
     return 0;
 }
-- 
GitLab