Inherit mesos-slave attributes

api/instance_service.go

@@ -23,7 +23,8 @@ type InstanceAPI struct {
 
 func (s *InstanceAPI) Create(ctx context.Context, in *CreateRequest) (*CreateReply, error) {
 	inst, err := model.Instances(ctx).Create(&model.Instance{
-		Template: in.GetTemplate(),
+		Template:     in.GetTemplate(),
+		AutoRecovery: in.GetAutoRecovery(),
 	})
 	if err != nil {
 		log.WithError(err).Error()
@@ -94,7 +95,10 @@ func (s *InstanceAPI) Run(ctx context.Context, in *CreateRequest) (*RunReply, er
 	if err := checkSupportAPI(in.GetTemplate(), ctx); err != nil {
 		return nil, err
 	}
-	res1, err := s.Create(ctx, &CreateRequest{Template: in.GetTemplate()})
+	res1, err := s.Create(ctx, &CreateRequest{
+		Template:     in.GetTemplate(),
+		AutoRecovery: in.GetAutoRecovery(),
+	})
 	if err != nil {
 		log.WithError(err).Error("Failed InstanceAPI.Run at Create")
 		return nil, err

ci/citest/acceptance-test/multibox/10.0.100.13-vdc-executor-null/guestroot/etc/mesos-slave/attributes

@@ -1 +1 @@
-hypervisor:null
+hypervisor:null;openvdc-node-id:null1

ci/citest/acceptance-test/multibox/10.0.100.13-vdc-executor-null/guestroot/etc/openvdc/executor.toml

@@ -1,5 +1,3 @@
-[hypervisor]
-driver = "null"
 
 [zookeeper]
 endpoint = "zk://10.0.100.10:2181,10.0.100.11:2181,10.0.100.12:2181/openvdc"

ci/citest/acceptance-test/multibox/10.0.100.14-vdc-executor-lxc/guestroot/etc/mesos-slave/attributes

@@ -1 +1 @@
-hypervisor:lxc;node-groups:linuxbr
+hypervisor:lxc;openvdc-node-id:lxc1;node-groups:linuxbr

ci/citest/acceptance-test/multibox/10.0.100.14-vdc-executor-lxc/guestroot/etc/openvdc/executor.toml

@@ -1,5 +1,4 @@
 [hypervisor]
-driver = "lxc"
 script-path = "/etc/openvdc/scripts/"
 image-server-uri = "http://10.0.100.12/images"
 cache-path = "/var/cache/lxc/"

ci/citest/acceptance-test/multibox/10.0.100.15-vdc-executor-lxc-ovs/guestroot/etc/mesos-slave/attributes

@@ -1 +1 @@
-hypervisor:lxc;node-groups:ovs
+hypervisor:lxc;openvdc-node-id:lxc2;node-groups:ovs

ci/citest/acceptance-test/tests/crash_recovery_test.go

@@ -0,0 +1,35 @@
+// +build acceptance
+
+package tests
+
+import (
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestCrashRecovery(t *testing.T) {
+	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/lxc")
+	instance_id := strings.TrimSpace(stdout.String())
+
+	WaitInstance(t, 5*time.Minute, instance_id, "RUNNING", []string{"QUEUED", "STARTING"})
+	RunSshWithTimeoutAndReportFail(t, executor_lxc_ip, "sudo lxc-info -n "+instance_id, 10, 5)
+
+	stdout, _ = RunCmdAndReportFail(t, "openvdc", "stop", instance_id)
+	WaitInstance(t, 5*time.Minute, instance_id, "STOPPED", []string{"RUNNING", "STOPPING"})
+
+	//Simulate crash
+	RunSshWithTimeoutAndReportFail(t, executor_lxc_ip, "sudo systemctl stop mesos-slave", 10, 5)
+
+	//Give scheduler some time to register crash
+	time.Sleep(3 * time.Minute)
+
+	RunSshWithTimeoutAndReportFail(t, executor_lxc_ip, "sudo systemctl start mesos-slave", 10, 5)
+	time.Sleep(1 * time.Minute)
+
+	//stdout, _ = RunCmdAndReportFail(t, "openvdc", "stop", instance_id)
+	//WaitInstance(t, 5*time.Minute, instance_id, "STOPPED", []string{"RUNNING", "STOPPING"})
+
+	stdout, _ = RunCmdWithTimeoutAndReportFail(t, 10, 5, "openvdc", "destroy", instance_id)
+	WaitInstance(t, 5*time.Minute, instance_id, "TERMINATED", nil)
+}

ci/devbox/devbox-centos7.json

@@ -89,7 +89,7 @@
         "systemctl enable zookeeper",
         "systemctl enable mesos-master",
         "systemctl enable mesos-slave",
-        "echo 'hypervisor:lxc' > /etc/mesos-slave/attributes",
+        "echo 'hypervisor:lxc;openvdc-node-id:lxc1' > /etc/mesos-slave/attributes",
         "echo 'false' > /etc/mesos-slave/switch_user",
         "echo '{\"PATH\":\"/home/vagrant/go/src/github.com/axsh/openvdc:/usr/libexec/mesos:/usr/bin:/usr/sbin:/usr/local/bin\"}' > /etc/mesos-slave/executor_environment_variables",
         "#firewall-cmd --permanent --zone=public --add-port=5050/tcp",

cmd/lxc-openvdc/init_linux.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"log/syslog"
+	"github.com/Sirupsen/logrus"
+	logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
+)
+
+func init() {
+	hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_DEBUG, "lxc-openvdc")
+	if err != nil {
+		logrus.Fatal("Failed to initialize syslog hook: ", err)
+	}
+	logrus.AddHook(hook)
+}

cmd/lxc-openvdc/main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log/syslog"
 	"net/http"
 	"net/url"
 	"os"
@@ -14,7 +13,6 @@ import (
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
-	logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
 	"github.com/mholt/archiver"
 	"github.com/pkg/errors"
 )
@@ -29,14 +27,6 @@ var dist string
 var release string
 var arch string
 
-func init() {
-	hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_DEBUG, "lxc-openvdc")
-	if err != nil {
-		log.Fatal("Failed to initialize syslog hook: ", err)
-	}
-	log.AddHook(hook)
-}
-
 func main() {
 
 	_dist := flag.String("dist", "centos", "Name of the distribution")