lce14: content...

diff --git a/Makefile b/Makefile
index 2316f399b7919b1e307463c4df387e8bec6c0d0c..c0f4536ab9231680828f5b5b5347a32e5118b493 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ TARGET_BASE = $(TARGET_BASE_NAME)-base
 
 TARGET = $(TARGET_BASE_NAME)
 
-DIAIMAGES     = design-ctdb-three-nodes.dia ctdb-design-daemons.dia samba-layers.dia
+DIAIMAGES     = design-ctdb-three-nodes.dia ctdb-design-daemons.dia samba-layers.dia samba-release-stream.dia
 
-DIAIMAGES_PNG = design-ctdb-three-nodes.png ctdb-design-daemons.png samba-layers.png
+DIAIMAGES_PNG = design-ctdb-three-nodes.png ctdb-design-daemons.png samba-layers.png samba-release-stream.png
 
 DIAIMAGES_FIG = design-ctdb-three-nodes.fig ctdb-design-daemons.fig samba-layers.fig
 

diff --git a/base-wiki.wiki b/base-wiki.wiki
index 3f5a47e05dc18b5151224a99b6ef1d4691a61e03..d2711cb4f80a61eade1eb11a7aaae3f513cb9e2e 100644 (file)
--- a/base-wiki.wiki
+++ b/base-wiki.wiki
@@ -6,17 +6,89 @@
 
 ==== Samba File Serving Topics ====
 
-Core File Server:
 * SMB features (SMB3...)
+* Clustering (CTDB)
 * Performance
 * Interop (Protocols, NFS, AFP, ...)
+* special file systems support
 * ...
 
-Moreover:
+==== Other Samba Topics ====
+
 * Auth/Domain Member
 * RPC server
+* AD Sever
 * ...
 
+==== File Server Habitat ====
+
+* scalable file server
+** scale-out: powerful clusters
+** scale-down: low-end boxes
+* server workloads
+** hyper-v
+* cloud / openstack?
+* (samba $\leftrightarrow$ cifs.ko alternative to nfs?...)
+
+
+
+==== Short History ====
+
+* 1.9.17: 1996/08
+* 2.0: 1999/01: domain-member, +SWAT
+* 2.2: 2001/04: NT4-DC
+* 3.0: 2003/09: AD-member, Samba4 project started
+* 3.2: 2008/07: GPLv3, experimental clustering
+* 3.3: 2009/01: clustering
+* 3.4: 2009/07: merged S3+S4 code
+* 3.5: 2010/03: experimental SMB 2.0
+* 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:    performance, scalability, CTDB included
+
+==== Release Stream ====
+
+
+<[center]
+<<<samba-release-stream_exp.png,width=.8\textwidth>>>
+[center]>
+
+
+==== Performance ====
+
+* cpu usage
+** low profile platforme (arm, ...)
+** memory allocations
+* database performance
+** tdb
+*** mutexes
+*** freelist layout
+** concrete db design (notify, open files, ...)
+* scaling out (1 system)
+** parallelism
+*** async I/O with helper threads
+* cluster performance
+
+
+==== Interop ====
+
+* multi-protocol access
+** nfs (kernel, ganesha, ...)
+** afp: netatalk
+
+* client-specific
+** apple:
+*** @vfs\_fruit@
+*** spotlight
+*** AAPL
+** SMB2+ unix-extensions
+
+
+==== ====[plain]
+
+old
+
 
 ==== File Server Layout/Scope ====
 

diff --git a/base.tex b/base.tex
index e8eed30c9b7095cd7565ba041dfb4f92ccd58b9a..dc0f5783ea98b2cfced4c79d54ad2dbba723c1a5 100644 (file)
--- a/base.tex
+++ b/base.tex
@@ -30,7 +30,8 @@
 %%\ \\
 %%LinuxCon Europe 2014}
 
-\title[SambaFS]{Present and Future Fileserving With Samba}
+\title[SambaFS]{Present And Future File Serving With Samba \\
+\ }
 \subtitle{LinuxCon Europe 2014}
 
 %%\author[Michael Adam]{Michael Adam\\

diff --git a/samba-kisses-better-selection.jpg b/samba-kisses-better-selection.jpg
new file mode 100644 (file)
index 0000000..dc60f9b
Binary files /dev/null and b/samba-kisses-better-selection.jpg differ

diff --git a/samba-release-stream.dia b/samba-release-stream.dia
new file mode 100644 (file)
index 0000000..01b9ec5
Binary files /dev/null and b/samba-release-stream.dia differ

diff --git a/samba-release-stream_exp.png b/samba-release-stream_exp.png
new file mode 100644 (file)
index 0000000..1906ad1
Binary files /dev/null and b/samba-release-stream_exp.png differ