Comment out many slides.

diff --git a/base-wiki.wiki b/base-wiki.wiki
index 0b7f9f996cb0592b77be553f70452677db2abad2..4ab165f5e9c9b1da2be87acc3ea25c4ede755776 100644 (file)
--- a/base-wiki.wiki
+++ b/base-wiki.wiki
@@ -25,21 +25,22 @@
 * 3.6: 2011/09: SMB 2.0
 * 4.0: 2012/12: AD/DC, SMB 2.0 durable handles, 2.1, 3.0
 * 4.1: 2013/10: stability
-* 4.2: soon: AD trusts, performance, scalability, CTDB included
+* 4.2: 2015/03: AD trusts, leases, performance, scalability, CTDB
+%%%CTDB included
 
-==== Release Stream ====
-
-
-<[center]
-<<<samba-release-stream_exp.png,width=.8\textwidth>>>
-[center]>
-
-==== Release Planning ====
+%%% ==== Release Stream ====
+%%% 
+%%% 
+%%% <[center]
+%%% <<<samba-release-stream_exp.png,width=.8\textwidth>>>
+%%% [center]>
 
-<[center]
-\large
-@https://wiki.samba.org/index.php/Samba\_Release\_Planning@
-[center]>
+%%% ==== Release Planning ====
+%%% 
+%%% <[center]
+%%% \large
+%%% @https://wiki.samba.org/index.php/Samba\_Release\_Planning@
+%%% [center]>
 
 ==== Samba Team ====
 
@@ -54,20 +55,20 @@
 [center]>
 
 
-==== ====[plain]
-
-%%\transdissolve
-
-<[center]
-<[columns]
-[[[.3\textwidth]]]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[[[.3\textwidth]]]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[[[.3\textwidth]]]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[columns]>
-[center]>
+%%% ==== ====[plain]
+%%% 
+%%% %%\transdissolve
+%%% 
+%%% <[center]
+%%% <[columns]
+%%% [[[.3\textwidth]]]
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% [[[.3\textwidth]]]
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% [[[.3\textwidth]]]
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% [columns]>
+%%% [center]>
 
 
 
@@ -103,171 +104,171 @@
 %%* AD Sever
 %%* ...
 
-==== Performance ====[plain]
-
-%%\transdissolve
-
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-
-
-==== Performance - low end systems ====
-
-
-<[block]{Reduction of CPU usage for low profile platforms like arm (SMB2)}
-* Samba 4.0:
-** didn't saturate 1G nic (arm), CPU 100\%
-* reduced memory allocations
-* instrument SMB 2.1 multi-credit / large MTU
-* Samba 4.2:
-** saturates 1G nic (arm), CPU $<$ 100\%
-* ==> continuing
-[block]>
-
-==== Performance - DB performance ====
-
-<[block]{TDB}
-* trivial database
-* used for IPC (smbd processes)
-* cluster (CTDB): local copies
-[block]>
-
-<[block]{hot databases}
-* @locking.tdb@ (open files)
-* @brlock.tdb@ (byte range locks)
-* @notify\_index.tdb@ (for change notify)
-[block]>
-
-==== Performance - DB performance ====
-
-<[block]{problem 1}
-* fcntl byte range locks for record locks
-* contention via single kernel spinlock
-[block]>
-
-<[block]{solution}
-* alternative to fcntl: pthread robust mutexes
-* ==> massive speedup
-* ==> included in TDB 1.3.1,  Samba 4.2
-[block]>
-
-==== Performance - DB performance ====
-
-<[block]{problem 2}
-* freelist:
-** single chain, contended (@locking.tdb@)
-** gets fragmented (singly linked)
-* especially a problem in ctdb-cluster: vacuuming
-[block]>
-
-<[block]{improvements}
-* make use of small per-record freelists (dead records)
-* add automatic defragmentation upon traversal
-* ==> included in TDB 1.3.1, Samba 4.2
-[block]>
-
-==== Performance - DB performance ====
-<[block]{problem 3}
-* change notify not scalable
-[block]>
-
-<[block]{first improvement}
-* restructured @notify.tdb@ to
-** global @notify\_index.tdb@ and
-** local @notify.tdb@
-** ==> better but still not good enough for some workloads
-[block]>
-
-<[block]{next steps}
-* replace DB-approach by new scalable, async notify daemon using messaging
-* some false positives do not harm
-* ==> TODO
-[block]>
-
-
-==== Performance - scaling ====
-
-<[block]{parellelism}
-* samba is multi-process:
-** smbd child process $\leftrightarrow$ TCP connection
-** event-loop in one process
-* within a smbd process:
-** pthread-pool jobs for potentially blocking syscalls
-** ==> parallelism for reads/writes
-** default for async I/O since Samba 4.0
-[block]>
-
-==== Performance - scaling ====
-
-<[block]{messaging}
-* classical messaging:
-** messages.tdb and signals between processes
-** does not scale well
-* new massaging in Samba 4.2:
-** fast and scalable messaging based on unix datagram messages
-** ==> WIP: integrate with AD/DC messaging
-** ==> features fd-passing for sockets (SMB3 multi-channel)
-** ==> TODO: integrate into CTDB inter-node-messaging
-[block]>
-
-
-==== Interop ====[plain]
-
-%\transdissolve
-
-<[center]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[center]>
-
-
-==== Interop-Central ====
-
-<[block]{multi-protocol access}
-* nfs (kernel, ganesha, ...)
-* afp: netatalk
-* local access
-* SMB2+ unix-extensions
-[block]>
-
-
-==== File Server Layout/Scope ====
-
-<[center]
-<<<samba-layers.jpg,height=.8\textheight>>>
-[center]>
-
-
-==== Interop - Fruit ====
-
+%%% ==== Performance ====[plain]
+%%% 
+%%% %%\transdissolve
+%%% 
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% 
+%%% 
+%%% ==== Performance - low end systems ====
+%%% 
+%%% 
+%%% <[block]{Reduction of CPU usage for low profile platforms like arm (SMB2)}
+%%% * Samba 4.0:
+%%% ** didn't saturate 1G nic (arm), CPU 100\%
+%%% * reduced memory allocations
+%%% * instrument SMB 2.1 multi-credit / large MTU
+%%% * Samba 4.2:
+%%% ** saturates 1G nic (arm), CPU $<$ 100\%
+%%% * ==> continuing
+%%% [block]>
+%%% 
+%%% ==== Performance - DB performance ====
+%%% 
+%%% <[block]{TDB}
+%%% * trivial database
+%%% * used for IPC (smbd processes)
+%%% * cluster (CTDB): local copies
+%%% [block]>
+%%% 
+%%% <[block]{hot databases}
+%%% * @locking.tdb@ (open files)
+%%% * @brlock.tdb@ (byte range locks)
+%%% * @notify\_index.tdb@ (for change notify)
+%%% [block]>
+%%% 
+%%% ==== Performance - DB performance ====
+%%% 
+%%% <[block]{problem 1}
+%%% * fcntl byte range locks for record locks
+%%% * contention via single kernel spinlock
+%%% [block]>
+%%% 
+%%% <[block]{solution}
+%%% * alternative to fcntl: pthread robust mutexes
+%%% * ==> massive speedup
+%%% * ==> included in TDB 1.3.1,  Samba 4.2
+%%% [block]>
+%%% 
+%%% ==== Performance - DB performance ====
+%%% 
+%%% <[block]{problem 2}
+%%% * freelist:
+%%% ** single chain, contended (@locking.tdb@)
+%%% ** gets fragmented (singly linked)
+%%% * especially a problem in ctdb-cluster: vacuuming
+%%% [block]>
+%%% 
+%%% <[block]{improvements}
+%%% * make use of small per-record freelists (dead records)
+%%% * add automatic defragmentation upon traversal
+%%% * ==> included in TDB 1.3.1, Samba 4.2
+%%% [block]>
+%%% 
+%%% ==== Performance - DB performance ====
+%%% <[block]{problem 3}
+%%% * change notify not scalable
+%%% [block]>
+%%% 
+%%% <[block]{first improvement}
+%%% * restructured @notify.tdb@ to
+%%% ** global @notify\_index.tdb@ and
+%%% ** local @notify.tdb@
+%%% ** ==> better but still not good enough for some workloads
+%%% [block]>
+%%% 
+%%% <[block]{next steps}
+%%% * replace DB-approach by new scalable, async notify daemon using messaging
+%%% * some false positives do not harm
+%%% * ==> TODO
+%%% [block]>
+%%% 
+%%% 
+%%% ==== Performance - scaling ====
+%%% 
+%%% <[block]{parellelism}
+%%% * samba is multi-process:
+%%% ** smbd child process $\leftrightarrow$ TCP connection
+%%% ** event-loop in one process
+%%% * within a smbd process:
+%%% ** pthread-pool jobs for potentially blocking syscalls
+%%% ** ==> parallelism for reads/writes
+%%% ** default for async I/O since Samba 4.0
+%%% [block]>
+%%% 
+%%% ==== Performance - scaling ====
+%%% 
+%%% <[block]{messaging}
+%%% * classical messaging:
+%%% ** messages.tdb and signals between processes
+%%% ** does not scale well
+%%% * new massaging in Samba 4.2:
+%%% ** fast and scalable messaging based on unix datagram messages
+%%% ** ==> WIP: integrate with AD/DC messaging
+%%% ** ==> features fd-passing for sockets (SMB3 multi-channel)
+%%% ** ==> TODO: integrate into CTDB inter-node-messaging
+%%% [block]>
+
+
+%%% ==== Interop ====[plain]
+%%% 
+%%% %\transdissolve
+%%% 
+%%% <[center]
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% [center]>
+%%% 
+%%% 
+%%% ==== Interop-Central ====
+%%% 
+%%% <[block]{multi-protocol access}
+%%% * nfs (kernel, ganesha, ...)
+%%% * afp: netatalk
+%%% * local access
+%%% * SMB2+ unix-extensions
+%%% [block]>
 
-<[columns]
-[[[.9\textwidth]]]
-* MacOS 10.9: SMB 2.1 preferred file protocol
-* @vfs\_fruit@ - new module in Samba 4.2
-[[[.05\textwidth]]]
-[columns]>
 
-<[columns]
-[[[.55\textwidth]]]
-
-* spotlight
-** indexed search
-** dcerpc service
-** ==> under review
-* AAPL
-** SMB2 create context
-** speed up directory listings
-** ==> under review
-
-[[[.4\textwidth]]]
-<<<apfel_1280.jpg,width=.9\textwidth>>>
-[columns]>
+%%% ==== File Server Layout/Scope ====
+%%% 
+%%% <[center]
+%%% <<<samba-layers.jpg,height=.8\textheight>>>
+%%% [center]>
 
-==== ====[plain]
 
-<[center]
-\Large
-Fruit Demo
-[center]>
+%%% ==== Interop - Fruit ====
+%%% 
+%%% 
+%%% <[columns]
+%%% [[[.9\textwidth]]]
+%%% * MacOS 10.9: SMB 2.1 preferred file protocol
+%%% * @vfs\_fruit@ - new module in Samba 4.2
+%%% [[[.05\textwidth]]]
+%%% [columns]>
+%%% 
+%%% <[columns]
+%%% [[[.55\textwidth]]]
+%%% 
+%%% * spotlight
+%%% ** indexed search
+%%% ** dcerpc service
+%%% ** ==> under review
+%%% * AAPL
+%%% ** SMB2 create context
+%%% ** speed up directory listings
+%%% ** ==> under review
+%%% 
+%%% [[[.4\textwidth]]]
+%%% <<<apfel_1280.jpg,width=.9\textwidth>>>
+%%% [columns]>
+%%% 
+%%% ==== ====[plain]
+%%% 
+%%% <[center]
+%%% \Large
+%%% Fruit Demo
+%%% [center]>
 
 ==== SMB features ====[plain]
 
@@ -769,13 +770,13 @@ Multi-Channel Demo
 [center]>
 
 
-==== Misc ====[plain]
-
-%\transdissolve
-
-<[center]
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-[center]>
+%%% ==== Misc ====[plain]
+%%% 
+%%% %\transdissolve
+%%% 
+%%% <[center]
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% [center]>
 
 ==== Misc ====
 
@@ -808,13 +809,13 @@ Multi-Channel Demo
 [block]>
 
 
-==== Forecast: Cloudy ====
-
-<[block]{Possible involvement with OpenStack}
-* SMB storage service for Windows (and other) VMs
-* SMB3 storage backend for Hyper-V images
-* also: chances for AD-integration into auth
-[block]>
+%%% ==== Forecast: Cloudy ====
+%%% 
+%%% <[block]{Possible involvement with OpenStack}
+%%% * SMB storage service for Windows (and other) VMs
+%%% * SMB3 storage backend for Hyper-V images
+%%% * also: chances for AD-integration into auth
+%%% [block]>
 
 ==== Credits ====
 
@@ -828,25 +829,25 @@ Multi-Channel Demo
 [block]>
 
 
-==== Conclusion ====[plain]
-
-%%\transdissolve
-
-<<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
-
-
-==== Conclusion ====
-
-<[block]{Remember}
-* Samba 4.X is quite different from 3.Y
-[block]>
-
-<[block]{What's coming?}
-* Performance: the story continues
-* Interop: strengthen strenths
-* SMB(3) features: a lot to come ( ==> cluster, hyper-v, ...)
-* Some clouds in the sky...
-[block]>
+%%% ==== Conclusion ====[plain]
+%%% 
+%%% %%\transdissolve
+%%% 
+%%% <<<samba-chilli-flavour-crop-bright-1280.jpg,height=.8\textheight>>>
+%%% 
+%%% 
+%%% ==== Conclusion ====
+%%% 
+%%% <[block]{Remember}
+%%% * Samba 4.X is quite different from 3.Y
+%%% [block]>
+%%% 
+%%% <[block]{What's coming?}
+%%% * Performance: the story continues
+%%% * Interop: strengthen strenths
+%%% * SMB(3) features: a lot to come ( ==> cluster, hyper-v, ...)
+%%% * Some clouds in the sky...
+%%% [block]>
 
 
 ==== Thanks for your attention! ====[plain]