SQUASH TMP - Samba3 stuff

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index f007785cfff9266f54ce2cdf0380e4198f998f61..e06778d8193a4516062b94af27b5dea27213f1b7 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -43,6 +43,10 @@ sub teardown_env($$)
        $self->stop_sig_kill($nmbdpid);
        $self->stop_sig_kill($winbinddpid);
 
+       if (defined($envvars->{ctdb_vars})) {
+               $self->teardown_env_ctdb($envvars->{ctdb_vars});
+       }
+
        return 0;
 }
 
@@ -148,8 +152,7 @@ sub setup_env($$$)
                        }
                }
                return $self->setup_clusteredmember("$path/clusteredmember",
-                                                   $self->{vars}->{s3dc},
-                                                   "$path/ctdb");
+                                                   $self->{vars}->{s3dc});
        } else {
                return undef;
        }
@@ -239,15 +242,17 @@ sub setup_member($$$)
 
 sub setup_clusteredmember($$$$)
 {
-       my ($self, $prefix, $s3dcvars, $ctdbprefix) = @_;
+       my ($self, $prefix, $s3dcvars) = @_;
        my $public_if = 8;
 
+       print "PROVISIONING CLUSTERMEMBER8...";
+
+       my $ctdbprefix = "$prefix/ctdb";
+
        my $ctdb_vars = $self->setup_ctdb($ctdbprefix, $public_if);
 
        $ctdb_vars or return undef;
 
-       print "PROVISIONING CLUSTEREDMEMBER...";
-
        my $member_options = "
        security = domain
        server signing = on
@@ -255,9 +260,9 @@ sub setup_clusteredmember($$$$)
        ctdbd socket = $ctdb_vars->{SOCKET_FILE}
 ";
        my $ret = $self->provision($prefix,
-                                  "LOCALMEMBER3CLUSTERED",
+                                  "CLUSTERMEMBER8",
                                   $public_if,
-                                  "localmember3pass",
+                                  "clustermember8pass",
                                   $member_options);
 
        $ret or return undef;
@@ -287,6 +292,10 @@ sub setup_clusteredmember($$$$)
 
        $ret->{CTDB_SOCKET_FILE} = $ctdb_vars->{SOCKET_FILE};
 
+       $ret->{ctdb_vars} = $ctdb_vars;
+
+       $self->{vars}->{clusteredmember} = $ret;
+
        return $ret;
 }
 
@@ -1250,7 +1259,7 @@ sub setup_ctdb($$)
 
        # TODO $vars->... ?
 
-       $self->{vars}->{ctdb} = $vars;
+#      $self->{vars}->{ctdb} = $vars;
 
        return $vars;
 }
@@ -1259,7 +1268,7 @@ sub check_or_start_ctdb($$) {
        my ($self, $env_vars) = @_;
 
        unlink($env_vars->{CTDBD_TEST_LOG});
-       print "STARTING CTDB...";
+       print "STARTING CTDBD...";
        my $pid = fork();
        if ($pid == 0) {
                open STDOUT, ">$env_vars->{CTDBD_TEST_LOG}";
@@ -1268,6 +1277,7 @@ sub check_or_start_ctdb($$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                my @preargs = (Samba::bindir_path($self, "timelimit"), $self->{server_maxtime});
+               @preargs = ();
                if(defined($ENV{CTDBD_VALGRIND})) {
                        @preargs = split(/ /, $ENV{CTDBD_VALGRIND});
                }
@@ -1277,7 +1287,7 @@ sub check_or_start_ctdb($$) {
                        "--reclock=$env_vars->{RECLOCK_FILE}",
                        "--nlist=$env_vars->{NODES_FILE}",
                        "--nopublicipcheck",
-                       "--public-addresses=$env_vars->{PUBLIC_ADDRESSES_FILE}",
+#                      "--public-addresses=$env_vars->{PUBLIC_ADDRESSES_FILE}",
                        "--event-script-dir=$env_vars->{EVENT_SCRIPT_DIR}",
                        "--logfile=$env_vars->{LOG_FILE}",
                        "-d $env_vars->{DEBUG_LEVEL}",
@@ -1312,7 +1322,7 @@ sub provision_ctdb($$$$)
        my $piddir="$prefix_abs/pid";
        push @dirs, $piddir;
 
-       my $reclock_file = "$var_dir/reck.lock";
+       my $reclock_file = "$var_dir/rec.lock";
        my $socket_file = "$var_dir/ctdb.socket";
        my $log_file = "$var_dir/log.ctdb";
 
@@ -1357,7 +1367,7 @@ sub provision_ctdb($$$$)
                warn("Unable to open nodesfile '$nodes_file'");
                return undef;
        }
-       print NODES "$internal_ip";
+       print NODES "$internal_ip\n";
        close(NODES);
 
        # - setup public-addresses
@@ -1365,7 +1375,7 @@ sub provision_ctdb($$$$)
                warn("Unable to open public addresses file '$public_addresses_file'");
                return undef;
        }
-       print PUBLIC_ADDR "$public_addresses_file/128 lo";
+       print PUBLIC_ADDR "$public_ip/32 swrap$pub_iface\n";
        close(PUBLIC_ADDR);
 
 
@@ -1381,8 +1391,8 @@ sub provision_ctdb($$$$)
        $ret{DB_DIR_STATE} = $db_dir_state;
        $ret{LOG_FILE} = $log_file;
        $ret{EVENT_SCRIPT_DIR} = $event_script_dir;
-       $ret{PUBLIC_INTERFACE} = "lo";
-       $ret{DEBUG_LEVEL} = 2;
+       $ret{PUBLIC_INTERFACE} = "swrap$pub_iface";
+       $ret{DEBUG_LEVEL} = 4;
        $ret{PIDDIR} = $piddir;
 
        $ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $pub_iface;
@@ -1400,7 +1410,7 @@ sub wait_for_start_ctdb($$)
 
        print `ps axf | grep ctdbd`;
 
-       sleep(20);
+       sleep(3);
 
        my $cmd = "";
        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$envvars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";