Exclude node from cluster on non-recoverable error

knizhnik · knizhnik · commit 08994d48f33a · 2016-04-18T23:01:58.000+03:00
diff --git a/README b/README
@@ -1,4 +1,4 @@
-PostgreSQL Database Management System
+pPostgreSQL Database Management System
 =====================================
 
 This directory contains the source code distribution of the PostgreSQL
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -167,7 +167,8 @@ char const* const MtmNodeStatusMnem[] =
 	"Connected",
 	"Online",
 	"Recovery",
-	"InMinor"
+	"InMinor",
+	"OutOfService"
 };
 
 bool  MtmDoReplication;
@@ -1026,8 +1027,11 @@ void MtmHandleApplyError(void)
 	  case ERRCODE_INDEX_CORRUPTED:
 	  case ERRCODE_SYSTEM_ERROR:
 	  case ERRCODE_INTERNAL_ERROR:
-	  case ERRCODE_OUT_OF_MEMORY:
-		break;
+	  case ERRCODE_OUT_OF_MEMORY:		  
+		  elog(WARNING, "Node is excluded from cluster because of non-recoverable error %d", edata->sqlerrcode);
+		  MtmSwitchClusterMode(MTM_OUT_OF_SERVICE);
+		  kill(PostmasterPid, SIGQUIT);
+		  break;
 	}
 }
 
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -97,11 +97,12 @@ typedef enum
 typedef enum
 {
 	MTM_INITIALIZATION, /* Initial status */
-	MTM_OFFLINE,        /* Node is out of quorum */
+	MTM_OFFLINE,        /* Node is excluded from cluster */
 	MTM_CONNECTED,      /* Arbiter is established connections with other nodes */
 	MTM_ONLINE,         /* Ready to receive client's queries */
 	MTM_RECOVERY,       /* Node is in recovery process */
-	MTM_IN_MINORITY     /* Node is out of quorum */
+	MTM_IN_MINORITY,    /* Node is out of quorum */
+	MTM_OUT_OF_SERVICE  /* Node is not avaiable to to critical, non-recoverable error */
 } MtmNodeStatus;
 
 typedef enum

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PostgreSQL Database Management System`
	`1`	`+pPostgreSQL Database Management System`
`2`	`2`	`=====================================`
`3`	`3`
`4`	`4`	`This directory contains the source code distribution of the PostgreSQL`