[SCM] CTDB repository - branch master updated - ctdb-1.12-5-g5de9ec2

[Ronnie Sahlberg]

The branch, master has been updated
       via  5de9ec2bdf8067406165bc470becdca87f458ae9 (commit)
      from  df1ac1cfd65f32743ca2588edfdad46ce5a4f03f (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5de9ec2bdf8067406165bc470becdca87f458ae9
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Nov 9 08:12:44 2011 +1100

    SRVID ranges: Change the ranges for SRVIDs to allow 8 bit prefixes
    
    Update the ranges used for SRVID allocation to allow 8 bit prefixes and thus
    56 user-defined bits.
    Define the defacto-use of the 0x00 prefix as a SRVID used to register a process id
    Upgrade SAMBA/iSCSI/NFS/TEST from a 32 bit prefix each ot a 8 bit prefix each
    for private use.

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

Summary of changes:
 include/ctdb_protocol.h |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index f4019ab..f83399c 100644
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -140,33 +140,39 @@ struct ctdb_call_info {
 */
 #define CTDB_SRVID_TAKEOVER_RUN_RESPONSE  0xFD00000000000000LL
 
-/* A range of ports reserved for samba (top 32 bits)
- * All ports matching the 32 top bits are reserved for exclusive use by
+/* A range of ports reserved for registering a PID (top 8 bits)
+ * All ports matching the 8 top bits are reserved for exclusive use by
+ * registering a SRVID that matches the process-id of the requesting process
+ */
+#define CTDB_SRVID_PID_RANGE   0x0000000000000000LL
+
+/* A range of ports reserved for samba (top 8 bits)
+ * All ports matching the 8 top bits are reserved for exclusive use by
  * CIFS server
  */
 #define CTDB_SRVID_SAMBA_NOTIFY  0xFE00000000000000LL
 #define CTDB_SRVID_SAMBA_RANGE   0xFE00000000000000LL
 
-/* A range of ports reserved for a CTDB NFS server (top 32 bits)
- * All ports matching the 32 top bits are reserved for exclusive use by
+/* A range of ports reserved for a CTDB NFS server (top 8 bits)
+ * All ports matching the 8 top bits are reserved for exclusive use by
  * NFS server
  */
-#define CTDB_SRVID_NFSD_RANGE  0xFE01000000000000LL
+#define CTDB_SRVID_NFSD_RANGE  0xEE00000000000000LL
 
-/* A range of ports reserved for a CTDB ISCSI server (top 32 bits)
- * All ports matching the 32 top bits are reserved for exclusive use by
+/* A range of ports reserved for a CTDB ISCSI server (top 8 bits)
+ * All ports matching the 8 top bits are reserved for exclusive use by
  * ISCSI server
  */
-#define CTDB_SRVID_ISCSID_RANGE  0xFE02000000000000LL
+#define CTDB_SRVID_ISCSID_RANGE  0xDE00000000000000LL
 
-/* A range of ports reserved for testing (top 32 bits)
- * All ports matching the 32 top bits are reserved for exclusive use by
+/* A range of ports reserved for testing (top 8 bits)
+ * All ports matching the 8 top bits are reserved for exclusive use by
  * test applications
  */
-#define CTDB_SRVID_TEST_RANGE  0xFE03000000000000LL
+#define CTDB_SRVID_TEST_RANGE  0xCE00000000000000LL
 
 /* Range of ports reserved for traversals */
-#define CTDB_SRVID_TRAVERSE_RANGE  0xFE04000000000000LL
+#define CTDB_SRVID_TRAVERSE_RANGE  0xBE00000000000000LL
 
 /* used on the domain socket, send a pdu to the local daemon */
 #define CTDB_CURRENT_NODE     0xF0000001


-- 
CTDB repository