More work on witness dia pictures.

diff --git a/.gitignore b/.gitignore
index d38c149cc61d33df6db42048970c41f73bd193fd..99f352b205254db5208b1c38ef50506dad502abc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
+*.png
 *~

diff --git a/Makefile b/Makefile
index e890719f740850b9ff9ab6a193d5d2c589c38127..6edce3031e1b889567ebce61c198fcb87a05f769 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,10 @@ IMAGE_CTDB_DAEMONS = ctdb-design-daemons
 IMAGE_SAMBA_LAYERS = samba-layers
 IMAGE_CTDB_3N_WITNESS_STEP0 = design-ctdb-three-nodes-with-witness-step0
 IMAGE_CTDB_3N_WITNESS_STEP1 = design-ctdb-three-nodes-with-witness-step1
-IMAGE_CTDB_3N_WITNESS_STEP2 = design-ctdb-three-nodes-with-witness-step2
-IMAGE_CTDB_3N_WITNESS_STEP3 = design-ctdb-three-nodes-with-witness-step3
+IMAGE_CTDB_3N_WITNESS_STEP2A = design-ctdb-three-nodes-with-witness-step2a
+IMAGE_CTDB_3N_WITNESS_STEP2B = design-ctdb-three-nodes-with-witness-step2b
+IMAGE_CTDB_3N_WITNESS_STEP3A = design-ctdb-three-nodes-with-witness-step3a
+IMAGE_CTDB_3N_WITNESS_STEP3B = design-ctdb-three-nodes-with-witness-step3b
 IMAGE_CTDB_3N_WITNESS_STEP4 = design-ctdb-three-nodes-with-witness-step4
 IMAGE_CTDB_3N_WITNESS_STEP5 = design-ctdb-three-nodes-with-witness-step5
 IMAGE_SAMBA_DAEMONS_P1 = samba-daemons-vfs-p1
@@ -44,8 +46,10 @@ DIAIMAGES_BASE := \
                  $(IMAGE_CTDB_3N) \
                  $(IMAGE_CTDB_3N_WITNESS_STEP0) \
                  $(IMAGE_CTDB_3N_WITNESS_STEP1) \
-                 $(IMAGE_CTDB_3N_WITNESS_STEP2) \
-                 $(IMAGE_CTDB_3N_WITNESS_STEP3) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP2A) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP2B) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP3A) \
+                 $(IMAGE_CTDB_3N_WITNESS_STEP3B) \
                  $(IMAGE_CTDB_3N_WITNESS_STEP4) \
                  $(IMAGE_CTDB_3N_WITNESS_STEP5) \
                  $(IMAGE_CTDB_DAEMONS) \

diff --git a/design-ctdb-three-nodes-with-witness-step2.dia b/design-ctdb-three-nodes-with-witness-step2.dia
deleted file mode 100644 (file)
index 189c003..0000000
Binary files a/design-ctdb-three-nodes-with-witness-step2.dia and /dev/null differ

diff --git a/design-ctdb-three-nodes-with-witness-step2a.dia b/design-ctdb-three-nodes-with-witness-step2a.dia
new file mode 100644 (file)
index 0000000..2a1f4a8
Binary files /dev/null and b/design-ctdb-three-nodes-with-witness-step2a.dia differ

diff --git a/design-ctdb-three-nodes-with-witness-step2b.dia b/design-ctdb-three-nodes-with-witness-step2b.dia
new file mode 100644 (file)
index 0000000..fdb33a4
Binary files /dev/null and b/design-ctdb-three-nodes-with-witness-step2b.dia differ

diff --git a/design-ctdb-three-nodes-with-witness-step3a.dia b/design-ctdb-three-nodes-with-witness-step3a.dia
new file mode 100644 (file)
index 0000000..d3683b0
Binary files /dev/null and b/design-ctdb-three-nodes-with-witness-step3a.dia differ

diff --git a/design-ctdb-three-nodes-with-witness-step3.dia b/design-ctdb-three-nodes-with-witness-step3b.dia
similarity index 100%
rename from design-ctdb-three-nodes-with-witness-step3.dia
rename to design-ctdb-three-nodes-with-witness-step3b.dia

diff --git a/design-ctdb-three-nodes-with-witness-step4.dia b/design-ctdb-three-nodes-with-witness-step4.dia
index fda2dc950798fd81d553030b57e664d4498bbce0..6ba4363ba1797492155f22ee4b5f470029a617ed 100644 (file)
Binary files a/design-ctdb-three-nodes-with-witness-step4.dia and b/design-ctdb-three-nodes-with-witness-step4.dia differ

diff --git a/design-ctdb-three-nodes-with-witness-step5.dia b/design-ctdb-three-nodes-with-witness-step5.dia
index 746452d745861c481656ff8c3da96e6f80317ebe..fda2dc950798fd81d553030b57e664d4498bbce0 100644 (file)
Binary files a/design-ctdb-three-nodes-with-witness-step5.dia and b/design-ctdb-three-nodes-with-witness-step5.dia differ

diff --git a/smb3.wiki b/smb3.wiki
index e545ae749a259984b2b77f08190f54d84d8c09e0..03eba07302c65e2387b4cc028f05f20fad88478d 100644 (file)
--- a/smb3.wiki
+++ b/smb3.wiki
@@ -65,13 +65,25 @@ Samba Witness service will cause Windows clients to reconnect:
 ==== Witness - Failover with SMB3 in a Samba/CTDB cluster ====
 
 <[center]
-<<<design-ctdb-three-nodes-with-witness-step2.png, width=.95\textwidth>>>
+<<<design-ctdb-three-nodes-with-witness-step2a.png, width=.95\textwidth>>>
 [center]>
 
 ==== Witness - Failover with SMB3 in a Samba/CTDB cluster ====
 
 <[center]
-<<<design-ctdb-three-nodes-with-witness-step3.png, width=.95\textwidth>>>
+<<<design-ctdb-three-nodes-with-witness-step2b.png, width=.95\textwidth>>>
+[center]>
+
+==== Witness - Failover with SMB3 in a Samba/CTDB cluster ====
+
+<[center]
+<<<design-ctdb-three-nodes-with-witness-step3a.png, width=.95\textwidth>>>
+[center]>
+
+==== Witness - Failover with SMB3 in a Samba/CTDB cluster ====
+
+<[center]
+<<<design-ctdb-three-nodes-with-witness-step3b.png, width=.95\textwidth>>>
 [center]>
 
 ==== Witness - Failover with SMB3 in a Samba/CTDB cluster ====