From 8488ed3b3b3fabfdbaa537a912e559a78bd7e812 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Mon, 15 Aug 2016 08:32:49 -0600
Subject: [PATCH] Watch for a local experiment of the same name when the target
 cluster is the local cluster. This closes issue #114.

---
 apt/create_instance.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apt/create_instance.in b/apt/create_instance.in
index 0ccd591ad..d4d6c7632 100755
--- a/apt/create_instance.in
+++ b/apt/create_instance.in
@@ -89,8 +89,10 @@ my $UPDATEGENIUSER= "$TB/sbin/protogeni/updategeniuser";
 my $STITCHER      = "$TB/gcf/src/stitcher.py";
 my $OPENSSL       = "/usr/bin/openssl";
 my $MANAGEINSTANCE= "$TB/bin/manage_instance";
+my $MANAGEDATASET = "$TB/bin/manage_dataset";
 my $DEFAULT_URN   = "urn:publicid:IDN+$OURDOMAIN+authority+cm";
 my $GUEST_URN     = "urn:publicid:IDN+apt.emulab.net+authority+cm";
+my $PROTOGENI_LOCALUSER= @PROTOGENI_LOCALUSER@;
 my $default_aggregate_urn = $DEFAULT_URN;
 
 # un-taint path
@@ -112,6 +114,7 @@ use APT_Instance;
 use APT_Geni;
 use APT_Dataset;
 use APT_Aggregate;
+use Experiment;
 use User;
 use Project;
 use Group;
@@ -638,9 +641,12 @@ my $SERVER_NAME = (exists($ENV{"SERVER_NAME"}) ? $ENV{"SERVER_NAME"} : "");
 #
 # Make sure slice is unique. Probably retry here at some point. 
 #
-if (GeniSlice->Lookup($slice_hrn) || GeniSlice->Lookup($slice_urn)) {
+if (GeniSlice->Lookup($slice_hrn) || GeniSlice->Lookup($slice_urn) ||
+    ($PROTOGENI_LOCALUSER &&
+     (grep {$_ eq $DEFAULT_URN} @aggregate_urns) &&
+     Experiment->Lookup($project->pid(), $userslice_id))) {
     if (defined($userslice_id)) {
-	UserError("Slice name already in use, please use another. If you ".
+	UserError("Experiment name already in use, please use another. If you ".
 		  "just terminated an experiment with this name, it takes a ".
 		  "minute or two for the name to become available again.");
     }
-- 
GitLab