From 34a30f9fb6058cec26dd40f809c12a0ec8436b3a Mon Sep 17 00:00:00 2001
From: Russ Fish <fish@flux.utah.edu>
Date: Wed, 14 Nov 2007 21:32:26 +0000
Subject: [PATCH] Patches that went from Leigh to Keith and back again.

---
 sql/resources.pl    | 19 +++++++++++++++++++
 sql/step4_newids.pl |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/sql/resources.pl b/sql/resources.pl
index 9fbd3e4c2..67f1c2074 100755
--- a/sql/resources.pl
+++ b/sql/resources.pl
@@ -158,6 +158,25 @@ my $query_result =
 ($nextidx) = $query_result->fetchrow_array();
 $nextidx += 100000;
 
+$query_result =
+     DBQueryFatal("select e.pid,e.eid,e.idx,r.idx,".
+		 "     e.expt_head_uid,e.creator_idx,e.expt_created ".
+		 "  from experiments as e ".
+		 "left join testbed_stats_new as s on e.idx=s.exptidx ".
+		 "left join experiment_resources_new as r on ".
+		 "     r.exptidx=e.idx ".
+		 "where s.exptidx is null and e.pid='emulab-ops'");
+
+while (my ($pid,$eid,$exptidx,$rsrcidx,$uid,$uid_idx,$created) =
+	$query_result->fetchrow_array()) {
+     print "Adding missing testbed_stats record for $pid,$eid,$exptidx\n";
+     DBQueryFatal("insert into testbed_stats_new ".
+		 "(idx, start_time, end_time, exptidx, rsrcidx, action, ".
+		 " exitcode, uid, uid_idx) values ".
+		 "(NULL, '$created', '$created', $exptidx, $rsrcidx, ".
+		 " 'new', 0, '$uid', '$uid_idx')");
+}
+
 $query_result =
     DBQueryFatal("select s.exptidx,e.state from experiment_stats as s ".
 		 "left join experiments as e on e.idx=s.exptidx ".
diff --git a/sql/step4_newids.pl b/sql/step4_newids.pl
index 3111ed8f9..b5a8afb08 100755
--- a/sql/step4_newids.pl
+++ b/sql/step4_newids.pl
@@ -242,7 +242,7 @@ while (my ($old_imageid, $old_part1, $old_part2,
 DBQueryFatal("alter table temp_images add PRIMARY KEY (`imageid`)");
 
 DBQueryFatal("replace into emulab_indicies (name, idx) ".
-	     "values ('next_osid', $index)");
+	     "values ('next_osid', $index), ('next_imageid',$index)");
 
 # osidtoimageid
 $query_result = DBQueryFatal("select * from osidtoimageid");
-- 
GitLab