From 9529f565b2d40e23958b8eed514467a88acf72dc Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Thu, 20 Jul 2017 14:43:41 -0400
Subject: [PATCH] Add option to use file-based locking for libkpod state

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 cmd/crio/config.go          |  4 ++++
 cmd/crio/main.go            |  7 +++++++
 libkpod/config.go           | 13 ++++++++++---
 libkpod/container_server.go | 14 +++++++++++++-
 server/server.go            |  1 +
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/cmd/crio/config.go b/cmd/crio/config.go
index bcd41042..e886aba3 100644
--- a/cmd/crio/config.go
+++ b/cmd/crio/config.go
@@ -41,6 +41,10 @@ stream_address = "{{ .StreamAddress }}"
 # stream_port is the port on which the stream server will listen
 stream_port = "{{ .StreamPort }}"
 
+# file_locking is whether file-based locking will be used instead of
+# in-memory locking
+file_locking = {{ .FileLocking }}
+
 # The "crio.runtime" table contains settings pertaining to the OCI
 # runtime used and options for how to set up and manage the OCI runtime.
 [crio.runtime]
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
index 98c7a8e8..d91e9308 100644
--- a/cmd/crio/main.go
+++ b/cmd/crio/main.go
@@ -75,6 +75,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
 	if ctx.GlobalIsSet("storage-opt") {
 		config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
 	}
+	if ctx.GlobalIsSet("file-locking") {
+		config.FileLocking = ctx.GlobalBool("file-locking")
+	}
 	if ctx.GlobalIsSet("insecure-registry") {
 		config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registry")
 	}
@@ -216,6 +219,10 @@ func main() {
 			Name:  "storage-opt",
 			Usage: "storage driver option",
 		},
+		cli.BoolFlag{
+			Name:  "file-locking",
+			Usage: "enable or disable file-based locking",
+		},
 		cli.StringSliceFlag{
 			Name:  "insecure-registry",
 			Usage: "whether to disable TLS verification for the given registry",
diff --git a/libkpod/config.go b/libkpod/config.go
index 27fbae8b..6390d76a 100644
--- a/libkpod/config.go
+++ b/libkpod/config.go
@@ -21,6 +21,7 @@ const (
 	cniConfigDir        = "/etc/cni/net.d/"
 	cniBinDir           = "/opt/cni/bin/"
 	cgroupManager       = "cgroupfs"
+	lockPath            = "/run/crio.lock"
 )
 
 // Config represents the entire set of configuration values that can be set for
@@ -74,6 +75,11 @@ type RootConfig struct {
 	// LogDir is the default log directory were all logs will go unless kubelet
 	// tells us to put them somewhere else.
 	LogDir string `toml:"log_dir"`
+
+	// FileLocking specifies whether to use file-based or in-memory locking
+	// File-based locking is required when multiple users of libkpod are
+	// present on the same system
+	FileLocking bool `toml:"file_locking"`
 }
 
 // RuntimeConfig represents the "crio.runtime" TOML config table.
@@ -233,9 +239,10 @@ func (c *Config) ToFile(path string) error {
 func DefaultConfig() *Config {
 	return &Config{
 		RootConfig: RootConfig{
-			Root:    crioRoot,
-			RunRoot: crioRunRoot,
-			LogDir:  "/var/log/crio/pods",
+			Root:        crioRoot,
+			RunRoot:     crioRunRoot,
+			LogDir:      "/var/log/crio/pods",
+			FileLocking: true,
 		},
 		RuntimeConfig: RuntimeConfig{
 			Runtime:                  "/usr/bin/runc",
diff --git a/libkpod/container_server.go b/libkpod/container_server.go
index 0b3e7fca..2f36ec16 100644
--- a/libkpod/container_server.go
+++ b/libkpod/container_server.go
@@ -98,6 +98,18 @@ func New(config *Config) (*ContainerServer, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	var lock sync.Locker
+	if config.FileLocking {
+		fileLock, err := cstorage.GetLockfile(lockPath)
+		if err != nil {
+			return nil, fmt.Errorf("error obtaining lockfile: %v", err)
+		}
+		lock = fileLock
+	} else {
+		lock = new(sync.Mutex)
+	}
+
 	return &ContainerServer{
 		runtime:            runtime,
 		store:              store,
@@ -107,7 +119,7 @@ func New(config *Config) (*ContainerServer, error) {
 		podNameIndex:       registrar.NewRegistrar(),
 		podIDIndex:         truncindex.NewTruncIndex([]string{}),
 		imageContext:       &types.SystemContext{SignaturePolicyPath: config.SignaturePolicyPath},
-		stateLock:          new(sync.Mutex),
+		stateLock:          lock,
 		state: &containerServerState{
 			containers: oci.NewMemoryStore(),
 			sandboxes:  make(map[string]*sandbox.Sandbox),
diff --git a/server/server.go b/server/server.go
index 477bfdf1..fa4ef56f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -502,6 +502,7 @@ func New(config *Config) (*Server, error) {
 		appArmorEnabled:      apparmor.IsEnabled(),
 		appArmorProfile:      config.ApparmorProfile,
 	}
+
 	if s.seccompEnabled {
 		seccompProfile, fileErr := ioutil.ReadFile(config.SeccompProfile)
 		if fileErr != nil {