postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  0794d85a15b5124f666190926ae036dec9f39855 (commit)
      from  c811d7f4a755154cdf9f4b5e0353aad56fa16331 (commit)


- Log -----------------------------------------------------------------
commit 0794d85a15b5124f666190926ae036dec9f39855
Author: Koichi Suzuki <koi...@gm...>
Date:   Tue Apr 5 19:00:05 2011 +0900

    This commit is to tweak the message from xcm_telhowto.
    
    When all the coordinators fails, it tells to stop the failed coordinator
    and then shutdown whole cluster.
    
    If all the mirrors of a datanode fails, it does not tell to stop
    the last failed mirror and just tells to shutdown the whole cluster.
    
    This commit tweaks this bahavior and tells to stop the last
    failed mirror before shutdown.

diff --git a/src/pgxc/xcm/xcm_telhowto.c b/src/pgxc/xcm/xcm_telhowto.c
index c53d257..3a3afa8 100644
--- a/src/pgxc/xcm/xcm_telhowto.c
+++ b/src/pgxc/xcm/xcm_telhowto.c
@@ -605,7 +605,11 @@ static void handle_mirror_failure(int ac, char *av[])
 	if (surviving_mirror <= 0) {
 		/*
 		 * No mirror available!
+		 * Anyway we should try to stop the mirro gracefully before shutdown.
+		 * Please note it may not make sense to try to change primary.
+		 * There's no datanode mirror surviving to take over primary.
 		 */
+		printf("stop mirror %d %d\n", datanode_id, mirror_id);
 		printf("shutdown\n");
 		fflush(stdout);
 		return;

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

Summary of changes:
 src/pgxc/xcm/xcm_telhowto.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  c811d7f4a755154cdf9f4b5e0353aad56fa16331 (commit)
      from  79263d24f7768522f238b7be0b8c07fc162fb742 (commit)


- Log -----------------------------------------------------------------
commit c811d7f4a755154cdf9f4b5e0353aad56fa16331
Author: Koichi Suzuki <koi...@gm...>
Date:   Tue Apr 5 18:38:43 2011 +0900

    This commit is a tweak to gtm_txn.c to avoid warning messages at the time of make.
    
    This code is not complete yet and actually is not used from any other code.
    
    To avoid any problems in the future, I added some of the lines so that
    the variable is properly initialized and we will have assert message
    when incomplete codes are accidentally reached.

diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index 9cfbeb6..0c6c238 100644
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -101,7 +101,7 @@ GTM_InitTxnManager(void)
 static XidStatus
 GlobalTransactionIdGetStatus(GlobalTransactionId transactionId)
 {
-	XidStatus	xidstatus;
+	XidStatus	xidstatus = TRANSACTION_STATUS_IN_PROGRESS;
 
 	/*
 	 * Also, check to see if the transaction ID is a permanent one.
@@ -117,7 +117,10 @@ GlobalTransactionIdGetStatus(GlobalTransactionId transactionId)
 
 	/*
 	 * TODO To be implemeneted
+	 *
+	 * This code is not completed yet and the latter code must not be reached.
 	 */
+	Assert(0);
 	return xidstatus;
 }
 

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

Summary of changes:
 src/gtm/main/gtm_txn.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, ha_support has been updated
       via  79263d24f7768522f238b7be0b8c07fc162fb742 (commit)
      from  1fc12bd8cc427393ad4c0597a85c35060e1b1a2b (commit)


- Log -----------------------------------------------------------------
commit 79263d24f7768522f238b7be0b8c07fc162fb742
Author: Koichi Suzuki <koi...@gm...>
Date:   Tue Apr 5 14:12:24 2011 +0900

    This commit is to fix wrong commit done last.    It was to fix xcm_telhowto
    behavior where it should have told to shutdown the cluster when no coordinator
    is running.   Code correction was wrong and was corrected.
    
    Thanks Sudo-san for findding this.

diff --git a/src/include/pgxc/xcm/node_membership_struct.h b/src/include/pgxc/xcm/node_membership_struct.h
index 754e472..affad93 100644
--- a/src/include/pgxc/xcm/node_membership_struct.h
+++ b/src/include/pgxc/xcm/node_membership_struct.h
@@ -460,13 +460,13 @@ typedef struct xcm_fault_comps {
  */
 #define XCM_OK 						0 	/* Successful */
 #define XCM_OTHER_UPDATE 			1  /* Shared memory updated for some reason */
+#define XCM_ERR_COMP_FAILED 		2  /* Specified component is not running */
 #define XCM_ERR_NOT_INITIALIZED 	-1  /* Shared memory not built yet */
 #define XCM_ERR_OUT_OF_RANGE 		-2  /* Specified component does not exist */
-#define XCM_ERR_COMP_FAILED 		-3  /* Specified component is not running */
-#define XCM_ERR_MISC 				-4  /* Other system call error */
-#define XCM_ERR_PARM 				-5 	/* Invalid parameters specified */
-#define XCM_ERR_STATUS				-6	/* Cluster status cannot accept the operation */
-#define XCM_NOT_FOUND				-7	/* Indicates that the specified object not found */
+#define XCM_ERR_MISC 				-3  /* Other system call error */
+#define XCM_ERR_PARM 				-4 	/* Invalid parameters specified */
+#define XCM_ERR_STATUS				-5	/* Cluster status cannot accept the operation */
+#define XCM_NOT_FOUND				-6	/* Indicates that the specified object not found */
 
 /*
  * Misc. magic numbers/values.
diff --git a/src/pgxc/xcm/xcm_telhowto.c b/src/pgxc/xcm/xcm_telhowto.c
index 41e736f..c53d257 100644
--- a/src/pgxc/xcm/xcm_telhowto.c
+++ b/src/pgxc/xcm/xcm_telhowto.c
@@ -514,7 +514,7 @@ static void handle_coordinator_failure(int ac, char *av[])
 			   rv, __LINE__);
 		end_and_exit(1);
 	}
-	for (ii = 1, live_coord_count = 0; ii <= rv; ii++)
+	for (ii = 1, live_coord_count = 0; ii <= coord_count; ii++)
 	{
 		rv = get_xcm_coordinator_status(ii, &coord_status);
 		if (rv < 0)
@@ -530,7 +530,7 @@ static void handle_coordinator_failure(int ac, char *av[])
 	}
 	if (live_coord_count <= 0)
 	{
-		printf("shutdonw\n");
+		printf("shutdown\n");
 		end_and_exit(0);
 	}
 	fflush(stdout);

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

Summary of changes:
 src/include/pgxc/xcm/node_membership_struct.h |   10 +++++-----
 src/pgxc/xcm/xcm_telhowto.c                   |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Postgres-XC