]> git.proxmox.com Git - pve-cluster.git/commitdiff
correctly wait for quorum when adding a node
authorDietmar Maurer <dietmar@proxmox.com>
Tue, 20 Mar 2012 08:56:25 +0000 (09:56 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Tue, 20 Mar 2012 08:56:25 +0000 (09:56 +0100)
data/PVE/pvecm

index d0d2d3f7bca7aa5b6f16bfb088f2b545ff720419..6a04990e296a9de4e11dac0afc75725a21a658df 100755 (executable)
@@ -320,8 +320,7 @@ __PACKAGE__->register_method ({
     code => sub {
        my ($param) = @_;
 
-       die "cluster not ready - no quorum?\n"
-           if !PVE::Cluster::check_cfs_quorum();
+       PVE::Cluster::check_cfs_quorum();
 
        my $cmd = ['ccs_tool', 'delnode', '-c', $clusterconf, $param->{node}];
 
@@ -446,7 +445,7 @@ __PACKAGE__->register_method ({
 
            # wait for quorum
            my $printqmsg = 1;
-           while (!PVE::Cluster::check_cfs_quorum()) {
+           while (!PVE::Cluster::check_cfs_quorum(1)) {
                if ($printqmsg) {
                    print "waiting for quorum...";
                    STDOUT->flush();