Revert back to working version.

tbsetup/exports_setup.in

@@ -39,7 +39,7 @@ if ($EUID != 0) {
 	"    Must be root! Maybe its a development version?\n");
 }
 # XXX Hacky!
-if (0 && $TB ne "/usr/testbed") {
+if ($TB ne "/usr/testbed") {
     print STDERR "*** $0:\n".
 	         "    Wrong version. Maybe its a development version?\n";
     #
@@ -95,67 +95,184 @@ print MAP "#\n";
 print MAP "\n";
 
 #
-# First gather up all the nodes that are reserved and the required info.
+# We export to particular nodes, based on the experiment that is allocated
+# to the node. Since we want the exports file to be based on IP numbers,
+# we need this crazy join to find out the type of the node, so we can find
+# the control network card number, so we can find the IP address for that
+# card.
 #
-$nodes_result =
-    DBQueryFatal("select r.node_id,r.pid,r.eid,e.gid,i.IP from reserved as r ".
-		 "left join experiments as e on r.pid=e.pid and r.eid=e.eid ".
-		 "left join nodes on r.node_id=nodes.node_id ".
+# XXX - Because of mountd sillyness, group experiments cannot be exported
+#       here since the groups directory is in the same FS as the proj.
+#       This bothers mountd, since the same IP would be listed more than once
+#       on the right hand side. So, this first join eliminates nodes that
+#       part of group experiments (pid!=gid).
+#
+$db_result =
+    DBQueryFatal("select reserved.node_id,reserved.pid,interfaces.IP,a.pid ".
+		 "from reserved ".
+		 "left join exppid_access as a ".
+		 " on a.exp_pid=reserved.pid and a.exp_eid=reserved.eid ".
+		 "left join experiments as e on ".
+		 " reserved.pid=e.pid and reserved.eid=e.eid ".
+		 "left join nodes on reserved.node_id=nodes.node_id ".
 		 "left join node_types on node_types.type=nodes.type ".
-		 "left join interfaces as i on r.node_id=i.node_id ".
-		 " and i.card=node_types.control_net ".
-		 " where i.IP!='NULL' and r.node_id not like 'sh%' ".
-		 "order by i.IP");
+		 "left join interfaces on reserved.node_id=interfaces.node_id".
+		 " and interfaces.card=node_types.control_net ".
+		 "where interfaces.IP!='NULL' and e.gid=e.pid ".
+		 "order by reserved.pid,interfaces.IP");
 
-my %ipgroups	= ();
+#
+# Go through and build up a list of exported mounts for each IP. 
+#
+my %iphash = ();
+my @iplist = ();
 
-while (@row = $nodes_result->fetchrow_array) {
+while (@row = $db_result->fetchrow_array) {
     my $node_id = $row[0];
     my $pid     = $row[1];
-    my $eid     = $row[2];
-    my $gid     = $row[3];
-    my $ip      = $row[4];
-    my @dirlist = ();
+    my $ip      = $row[2];
+    my $subpid  = $row[3];
+
+    if (! defined($iphash{$ip})) {
+	$iphash{$ip} = [ $pid ];
+	push(@iplist, $ip);
 
-    push(@dirlist, "$projdir/$pid");
-    if ($gid ne $pid) {
-	push(@dirlist, "$groupdir/$pid/$gid");
+	if (defined($subpid)) {
+	    push(@{ $iphash{$ip} }, $subpid);
+	}
     }
+    else {
+	if (defined($subpid)) {
+	    push(@{ $iphash{$ip} }, $subpid);
+	}
+    }
+}
 
-    #
-    # Need the user list. 
-    #
-    $users_result =
-	DBQueryFatal("select distinct uid from group_membership ".
-		     "where pid='$pid' and gid='$gid' and trust!='none'");
+print MAP "#\n";
+print MAP "# Export Project directories\n";
+print MAP "#\n";
 
-    while (@usersrow = $users_result->fetchrow_array) {
-	my $uid = $usersrow[0];
+#
+# This takes the iphash array and spits out the mount lists using the
+# function provided.
+#
+if (@iplist) {
+    spitmounts(sub { my $pid = shift; print MAP "$projdir/$pid " });
+}
 
-	push(@dirlist, "$usersdir/$uid");
-    }
+#
+# Next determine what group directories need to be exported. This is done
+# only for experiments in which pid!=gid.
+#
+# XXX - See XXX above. The printer function below has to include the proj
+#       directory.
+#
+$db_result =
+    DBQueryFatal("select reserved.node_id,reserved.pid,interfaces.IP,e.gid ".
+		 "from reserved ".
+		 "left join experiments as e on ".
+		 " reserved.pid=e.pid and reserved.eid=e.eid ".
+		 "left join nodes on reserved.node_id=nodes.node_id ".
+		 "left join node_types on node_types.type=nodes.type ".
+		 "left join interfaces on reserved.node_id=interfaces.node_id".
+		 " and interfaces.card=node_types.control_net ".
+		 "where interfaces.IP!='NULL' and e.pid!=e.gid ".
+		 "order by reserved.pid,e.gid,interfaces.IP");
 
-    #
-    # Convert dirlist to a string and use that as a hash index to group
-    # IPs together with the same set of mounts.
-    #
-    my $str = join(" ", sort(@dirlist));
+#
+# Go through and build up a list of exported mounts for each IP. 
+#
+%iphash = ();
+@iplist = ();
+
+while (@row = $db_result->fetchrow_array) {
+    my $node_id = $row[0];
+    my $pid     = $row[1];
+    my $ip      = $row[2];
+    my $gid     = $row[3];
 
-    if (! defined($ipgroups{$str})) {
-	$ipgroups{$str} = [ $ip ];
+    if (! defined($iphash{$ip})) {
+	$iphash{$ip} = [ "$pid/$gid" ];
+	push(@iplist, $ip);
     }
     else {
-	push(@{ $ipgroups{$str} }, $ip);
+	push(@{ $iphash{$ip} }, "$pid/$gid");
     }
 }
 
+print MAP "#\n";
+print MAP "# Export Group directories\n";
+print MAP "#\n";
+
 #
-# Now spit out each group!
+# This takes the iphash array and spits out the mount lists using function
+# provided. Note that the function also prints include the proj dir. See
+# the XXX comments above. 
 #
-foreach my $str ( keys(%ipgroups) ) {
-    my @iplist = @{ $ipgroups{$str} };    
+if (@iplist) {
+    my $printer = sub {
+	my($pid, $gid) = split('/', $_[0]);
 
-    print MAP "$str -maproot=root @iplist\n";
+	print MAP "$projdir/$pid $groupdir/$pid/$gid ";
+    };
+    spitmounts($printer);
+}
+
+#
+# Now we need the users list for exporting from /users. We need to export
+# all of the project members to all of the machines in that projects
+# experiments. Also, since we again want the IPs, we need all of that crazy
+# join again. Even worse, we cannot list an IP address more than once, so
+# we end up with mulitple exports for any particular user (cause they can be
+# in multiple experiments within a project), but with non overlapping
+# sets of IP addresses. For example:
+#
+#	/users/stoller /users/mike 101.101.101.100 101.101.101.101
+#	/users/stoller             101.101.101.102
+#       /users/mike                101.101.101.103
+#
+$db_result =
+   DBQueryFatal("select distinct reserved.node_id,reserved.pid,".
+		"g.uid,interfaces.IP from reserved ".
+		"left join exppid_access as a ".
+		" on a.exp_pid=reserved.pid and a.exp_eid=reserved.eid ".
+		"left join group_membership as g on g.pid=a.pid or ".
+		"          (g.pid=reserved.pid and g.gid=g.pid) ".
+		"left join nodes on reserved.node_id=nodes.node_id ".
+		"left join node_types on node_types.type=nodes.type ".
+		"left join interfaces on reserved.node_id=interfaces.node_id ".
+		"and interfaces.card=node_types.control_net ".
+		"where interfaces.IP!='NULL' and g.trust!='none' ".
+		"order by reserved.pid,reserved.node_id");
+
+%iphash = ();
+@iplist = ();
+
+while (@row = $db_result->fetchrow_array) {
+    my $node_id = $row[0];
+    my $pid     = $row[1];
+    my $uid     = $row[2];
+    my $ip      = $row[3];
+
+    if (! defined($iphash{$ip})) {
+	$iphash{$ip} = [ $uid ];
+	push(@iplist, $ip);
+    }
+    else {
+	push(@{ $iphash{$ip} }, $uid);
+    }
+}
+
+print MAP "#\n";
+print MAP "# Export User directories\n";
+print MAP "#\n";
+
+#
+# This takes the iphash array and spits out the mount lists using the
+# function provided.
+#
+if (@iplist) {
+    spitmounts(sub { my $uid = shift; print MAP "$usersdir/$uid " });
 }
 
 print MAP "\n";
@@ -192,3 +309,80 @@ sub fatal {
     die($msg);
 }
 
+#
+# Spit out a set of mounts. The argument is the printer function to
+# format the mount line. 
+# 
+sub spitmounts($)
+{
+    my $printer = shift;
+    
+    #
+    # Sort each of the lists (per IP). 
+    # 
+    foreach my $ip ( @iplist ) {
+	my @lis = @{ $iphash{$ip} };
+
+	$iphash{$ip} = [ sort( @lis ) ];
+    }
+
+    #
+    # Next go through and combine sequential IPs that have exactly the
+    # same set of exports. Not perfect, but should result in a big
+    # enough reduction for now. At some point we should have our own
+    # exportfs program do this stuff instead of going through mountd.
+    #
+    # Shift off the first IP to initialize the sequence.
+    #
+    my @ipseq   = ( shift(@iplist) );
+    my @lastset = @{ $iphash{$ipseq[0]} };
+
+    foreach my $ip ( @iplist ) {
+	my @set = @{ $iphash{$ip} };
+
+	#
+	# Whenever the set changes, spit out what we have saved up, and then
+	# start over. 
+	# 
+	if (! listequal(\@set, \@lastset)) {
+	    foreach my $el ( @lastset ) {
+		&$printer($el);
+	    }
+	    print MAP "-maproot=root @ipseq\n";
+	    @ipseq = ();
+	}
+	push(@ipseq, $ip);
+	@lastset = @set;
+    }
+
+    #
+    # Last set of IPs.
+    #
+    if (@ipseq) {
+	foreach my $el ( @lastset ) {
+	    &$printer($el);
+	}
+	print MAP "-maproot=root @ipseq\n";
+    }
+}
+
+#
+# Compare two lists of tokens.
+# 
+sub listequal ($$)
+{
+    my($lista, $listb) = @_;
+
+    if (@$lista != @$listb) {
+	return 0;
+    }
+    for ($i = 0; $i < @$lista; $i++) {
+	if ($$lista[$i] ne $$listb[$i]) {
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+
+