[core] If needed, RESET before environment teardown

Author: teo

core/environment/transition.go

@@ -45,8 +45,8 @@ func MakeTransition(taskman *task.Manager, optype pb.ControlEnvironmentRequest_O
 		return NewStartActivityTransition(taskman)
 	case pb.ControlEnvironmentRequest_STOP_ACTIVITY:
 		return NewStopActivityTransition(taskman)
-	case pb.ControlEnvironmentRequest_EXIT:
-		fallthrough
+	case pb.ControlEnvironmentRequest_RESET:
+		return NewResetTransition(taskman)
 	case pb.ControlEnvironmentRequest_GO_ERROR:
 		fallthrough
 	case pb.ControlEnvironmentRequest_NOOP:

core/environment/transition_reset.go

@@ -0,0 +1,62 @@
+/*
+ * === This file is part of ALICE O² ===
+ *
+ * Copyright 2018 CERN and copyright holders of ALICE O².
+ * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In applying this license CERN does not waive the privileges and
+ * immunities granted to it by virtue of its status as an
+ * Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+package environment
+
+import (
+	"errors"
+	"github.com/AliceO2Group/Control/core/task"
+)
+
+func NewResetTransition(taskman *task.Manager) Transition {
+	return &ResetTransition{
+		baseTransition: baseTransition{
+			name:    "RESET",
+			taskman: taskman,
+		},
+	}
+}
+
+type ResetTransition struct {
+	baseTransition
+}
+
+func (t ResetTransition) do(env *Environment) (err error) {
+	if env == nil {
+		return errors.New("cannot transition in NIL environment")
+	}
+
+	err = t.taskman.TransitionTasks(
+		env.Id().Array(),
+		env.Workflow().GetTasks(),
+		task.CONFIGURED.String(),
+		task.RESET.String(),
+		task.STANDBY.String(),
+	)
+	if err != nil {
+		return
+	}
+
+	return
+}

core/server.go

@@ -26,20 +26,21 @@
 package core
 
 import (
+	"fmt"
+	"runtime"
+	"time"
+
 	"golang.org/x/net/context"
-    "google.golang.org/grpc"
+	"google.golang.org/grpc"
 
+	"github.com/AliceO2Group/Control/core/environment"
 	"github.com/AliceO2Group/Control/core/protos"
-	"google.golang.org/grpc/reflection"
-	"github.com/mesos/mesos-go/api/v1/lib/extras/store"
-	"runtime"
-	"fmt"
-	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/codes"
 	"github.com/looplab/fsm"
+	"github.com/mesos/mesos-go/api/v1/lib/extras/store"
 	"github.com/pborman/uuid"
-	"time"
-	"github.com/AliceO2Group/Control/core/environment"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/reflection"
+	"google.golang.org/grpc/status"
 )
 
 
@@ -269,9 +270,12 @@ func (m *RpcServer) DestroyEnvironment(cxt context.Context, req *pb.DestroyEnvir
 		return nil, status.Newf(codes.FailedPrecondition, "cannot destroy environment in state %s", env.CurrentState()).Err()
 	}
 
-	err = env.TryTransition(environment.MakeTransition(m.state.taskman, pb.ControlEnvironmentRequest_EXIT))
-	if err != nil {
-		return &pb.DestroyEnvironmentReply{}, status.New(codes.Internal, err.Error()).Err()
+	// This might transition to STANDBY if needed, of do nothing if we're already there
+	if env.CurrentState() == "CONFIGURED" {
+		err = env.TryTransition(environment.MakeTransition(m.state.taskman, pb.ControlEnvironmentRequest_RESET))
+		if err != nil {
+			return &pb.DestroyEnvironmentReply{}, status.New(codes.Internal, err.Error()).Err()
+		}
 	}
 
 	err = m.state.environments.TeardownEnvironment(env.Id())