Cluster Project branch, STABLE2, updated. cluster-2.03.04-22-g1a500cf

Cluster Project branch, STABLE2, updated. cluster-2.03.04-22-g1a500cf

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6

The branch, STABLE2 has been updated
       via  1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6 (commit)
       via  ba6254c4e68f088c9324f1d27ccf2a0c7215e1f7 (commit)
       via  c90cbd64efac793a5a364b561d78ff75e0018e97 (commit)
      from  40bb88dbe0b246107e7106a04bf2c8793d3c445d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a500cfd7f8ed5e4e2b3beb02ef709d49bf925a6
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri Jun 20 15:39:29 2008 +0200

    [QDISK] Remove duplicate debugging configuration
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit ba6254c4e68f088c9324f1d27ccf2a0c7215e1f7
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri Jun 20 15:36:10 2008 +0200

    [QDISK] get_config_data cleanup
    
    get_config_data does not need cluster name.
    
    change invokation from ccs_force_connect to ccs_connect.
    ccs_force_connect returns only when connection is succesful
    and can sit there forever.
    With the new libccs, if we are connected to cman, we can be
    100% sure that we will be able to do a ccs_connect.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit c90cbd64efac793a5a364b561d78ff75e0018e97
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri Jun 20 15:33:08 2008 +0200

    [QDISK] Fix debug type
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/qdisk/main.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 704995e..ed4aba5 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1083,8 +1083,8 @@ quorum_logout(qd_ctx *ctx)
 /**
   Grab all our configuration data from CCSD
  */
-int
-get_config_data(char *cluster_name, qd_ctx *ctx, struct h_data *h, int maxh,
+static int
+get_config_data(qd_ctx *ctx, struct h_data *h, int maxh,
 		int *cfh, int debug)
 {
 	int ccsfd = -1, loglevel = 4;
@@ -1093,7 +1093,7 @@ get_config_data(char *cluster_name, qd_ctx *ctx, struct h_data *h, int maxh,
 
 	clulog(LOG_DEBUG, "Loading configuration information\n");
 
-	ccsfd = ccs_force_connect(cluster_name, 1);
+	ccsfd = ccs_connect();
 	if (ccsfd < 0) {
 		clulog(LOG_CRIT, "Connection to CCSD failed; cannot start\n");
 		return -1;
@@ -1373,7 +1373,7 @@ main(int argc, char **argv)
 	cman_handle_t ch = NULL;
 	node_info_t ni[MAX_NODES_DISK];
 	struct h_data h[10];
-	char debug = 0, foreground = 0;
+	int debug = 0, foreground = 0;
 	char device[128];
 	pid_t pid;
 	quorum_header_t qh;
@@ -1451,15 +1451,14 @@ main(int argc, char **argv)
 
         if (debug) {
                 clu_set_loglevel(LOG_DEBUG);
-                ctx.qc_flags |= RF_DEBUG;
         }
-		
-	if (get_config_data(NULL, &ctx, h, 10, &cfh, debug) < 0) {
+
+	if (get_config_data(&ctx, h, 10, &cfh, debug) < 0) {
 		clulog_and_print(LOG_CRIT, "Configuration failed\n");
 		check_stop_cman(&ctx);
 		goto out;
 	}
-	
+
 	if (ctx.qc_label) {
 		ret = find_partitions(ctx.qc_label, device, sizeof(device), 0);
 		if (ret < 0) {


hooks/post-receive
--
Cluster Project