feat: add powercycle mode in reboot

- Fixes #4569 - Updated reboot process sequence - Updted api.descriptors to avoid proto type change linting error #4612 (comment) Signed-off-by: Rohit Dandamudi <rohit.dandamudi@siderolabs.com> Signed-off-by: Rohit Dandamudi <rohit.dandamudi@siderolabs.com>
siderolabs · Dec 2, 2021 · 7f99222 · 7f99222
1 parent bc69f6e
commit 7f99222
Show file tree

Hide file tree

Showing 12 changed files with 2,329 additions and 2,020 deletions.
diff --git a/api/api.descriptors b/api/api.descriptors
diff --git a/api/machine/machine.proto b/api/machine/machine.proto
@@ -52,7 +52,7 @@ service MachineService {
   rpc NetworkDeviceStats(google.protobuf.Empty) returns (NetworkDeviceStatsResponse);
   rpc Processes(google.protobuf.Empty) returns (ProcessesResponse);
   rpc Read(ReadRequest) returns (stream common.Data);
-  rpc Reboot(google.protobuf.Empty) returns (RebootResponse);
+  rpc Reboot(RebootRequest) returns (RebootResponse);
   rpc Restart(RestartRequest) returns (RestartResponse);
   rpc Rollback(RollbackRequest) returns (RollbackResponse);
   rpc Reset(ResetRequest) returns (ResetResponse);
@@ -90,6 +90,14 @@ message ApplyConfigurationResponse {
 }
 
 // rpc reboot
+message RebootRequest {
+  enum Mode {
+    DEFAULT = 0;
+    POWERCYCLE = 1;
+  }
+  Mode mode = 1;
+}
+
 // The reboot message containing the reboot status.
 message Reboot {
   common.Metadata metadata = 1;

diff --git a/cmd/talosctl/cmd/talos/reboot.go b/cmd/talosctl/cmd/talos/reboot.go
@@ -21,7 +21,19 @@ var rebootCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return WithClient(func(ctx context.Context, c *client.Client) error {
-			if err := c.Reboot(ctx); err != nil {
+			mode, err := cmd.Flags().GetString("mode")
+			if err != nil {
+				return fmt.Errorf("error getting input value for --mode flag: %s", err)
+			}
+
+			opts := []client.RebootMode{}
+
+			// skips kexec and reboots with power cycle
+			if mode == "powercycle" {
+				opts = append(opts, client.WithPowerCycle)
+			}
+
+			if err := c.Reboot(ctx, opts...); err != nil {
 				return fmt.Errorf("error executing reboot: %s", err)
 			}
 
@@ -31,5 +43,6 @@ var rebootCmd = &cobra.Command{
 }
 
 func init() {
+	rebootCmd.Flags().StringP("mode", "m", "default", "select the reboot mode: \"default\", \"powercyle\" (skips kexec)")
 	addCommand(rebootCmd)
 }
diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
@@ -208,7 +208,7 @@ func (s *Server) GenerateConfiguration(ctx context.Context, in *machine.Generate
 // Reboot implements the machine.MachineServer interface.
 //
 //nolint:dupl
-func (s *Server) Reboot(ctx context.Context, in *emptypb.Empty) (reply *machine.RebootResponse, err error) {
+func (s *Server) Reboot(ctx context.Context, in *machine.RebootRequest) (reply *machine.RebootResponse, err error) {
 	log.Printf("reboot via API received")
 
 	if err := s.checkSupported(runtime.Reboot); err != nil {

diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go
@@ -1754,6 +1754,14 @@ func ActivateLogicalVolumes(seq runtime.Sequence, data interface{}) (runtime.Tas
 //nolint:gocyclo
 func KexecPrepare(seq runtime.Sequence, data interface{}) (runtime.TaskExecutionFunc, string) {
 	return func(ctx context.Context, logger *log.Logger, r runtime.Runtime) error {
+		if req, ok := data.(*machineapi.RebootRequest); ok {
+			if req.Mode == machineapi.RebootRequest_POWERCYCLE {
+				log.Print("kexec skipped as reboot with power cycle was requested")
+
+				return nil
+			}
+		}
+
 		if r.Config() == nil {
 			return nil
 		}

diff --git a/internal/integration/api/etcd.go b/internal/integration/api/etcd.go
@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"google.golang.org/grpc/codes"
-	"google.golang.org/protobuf/types/known/emptypb"
 
 	"github.com/talos-systems/talos/internal/integration/base"
 	machineapi "github.com/talos-systems/talos/pkg/machinery/api/machine"
@@ -137,7 +136,7 @@ func (suite *EtcdSuite) TestEtcdLeaveCluster() {
 	// NB: Reboot the node so that it can rejoin the etcd cluster. This allows us
 	// to check the cluster health and catch any issues in rejoining.
 	suite.AssertRebooted(suite.ctx, node, func(nodeCtx context.Context) error {
-		_, err = suite.Client.MachineClient.Reboot(nodeCtx, &emptypb.Empty{})
+		_, err = suite.Client.MachineClient.Reboot(nodeCtx, &machineapi.RebootRequest{})
 
 		return err
 	}, 10*time.Minute)