Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master

1 files changed, 39 insertions, 5 deletions

diff --git a/src/repmgr/repmgr.msg b/src/repmgr/repmgr.msg
index 020f2e9c..ba544936 100644
--- a/src/repmgr/repmgr.msg
+++ b/src/repmgr/repmgr.msg
@@ -65,6 +65,11 @@ ARG	port		u_int16_t
 END
 
 BEGIN_MSG membership_data
+ARG	status          u_int32_t
+ARG	flags           u_int32_t
+END
+
+BEGIN_MSG v4membership_data
 ARG	flags           u_int32_t
 END
 
@@ -98,22 +103,51 @@ BEGIN_MSG membr_vers
 ARG	version		u_int32_t
 ARG	gen		u_int32_t
 END
+
 BEGIN_MSG site_info check_length
 ARG	host		DBT
 ARG	port		u_int16_t
+ARG	status		u_int32_t
+ARG	flags		u_int32_t
+END
+
+BEGIN_MSG v4site_info check_length
+ARG	host		DBT
+ARG	port		u_int16_t
 ARG	flags		u_int32_t
 END
 
 /*
  * If site A breaks or rejects a connection from site B, it first
  * tries to send B this message containing site A's currently known
- * membership DB version.  Site B can use this to decide what to do.
- * If site B knows of a later version, it should retry the connection
- * to site A later, polling at it until site A catches up.  However, if
- * site B's known version is less, it means that site B is no longer in 
- * the group, and so instead it should shut down and notify the application.
+ * membership DB version and site B's status in site A's membership DB.
+ * Site B can use them to decide what to do.  If site B knows of a later
+ * version, it should retry the connection to site A later, polling
+ * until site A catches up.  However, if site B's known version is
+ * less and site B's status is adding in site A's membership DB, it
+ * means that a badly-timed change of master may have caused the current
+ * master to lose B's membership DB update to present, so it should
+ * retry the connection to site A later, otherwise, site B is no longer
+ * in the group and it should shut down and notify the application.
  */
 BEGIN_MSG connect_reject
 ARG	version		u_int32_t
 ARG	gen		u_int32_t
+ARG	status		u_int32_t
+END
+
+BEGIN_MSG v4connect_reject
+ARG	version		u_int32_t
+ARG	gen		u_int32_t
+END
+
+/*
+ * For preferred master LSN history comparison between the sites.
+ * The next_gen_lsn is [0,0] if the next generation doesn't yet exist.
+ */
+BEGIN_MSG lsnhist_match
+ARG	lsn		DB_LSN
+ARG	hist_sec	u_int32_t
+ARG	hist_nsec	u_int32_t
+ARG	next_gen_lsn	DB_LSN
 END