Add ccontrol create reservation

Author: NamelessOIer

internal/ccontrol/CmdArgParser.go

@@ -28,18 +28,22 @@ import (
 )
 
 var (
-	FlagNodeName       string
-	FlagState          string
-	FlagReason         string
-	FlagPartitionName  string
-	FlagTaskId         uint32
-	FlagTaskIds        string
-	FlagQueryAll       bool
-	FlagTimeLimit      string
-	FlagPriority       float64
-	FlagHoldTime       string
-	FlagConfigFilePath string
-	FlagJson           bool
+	FlagNodeName        string
+	FlagState           string
+	FlagReason          string
+	FlagPartitionName   string
+	FlagTaskId          uint32
+	FlagTaskIds         string
+	FlagQueryAll        bool
+	FlagTimeLimit       string
+	FlagPriority        float64
+	FlagHoldTime        string
+	FlagConfigFilePath  string
+	FlagJson            bool
+	FlagReservationName string
+	FlagStartTime       string
+	FlagDuration        string
+	FlagNodes           string
 
 	RootCmd = &cobra.Command{
 		Use:     "ccontrol",
@@ -112,6 +116,17 @@ var (
 			}
 		},
 	}
+	// showReservationsCmd = &cobra.Command{
+	// 	Use:   "reservation",
+	// 	Short: "Display details of the reservations",
+	// 	Long:  "",
+	// 	Args:  cobra.ExactArgs(0),
+	// 	Run: func(cmd *cobra.Command, args []string) {
+	// 		if err := ShowReservations(); err != util.ErrorSuccess {
+	// 			os.Exit(err)
+	// 		}
+	// 	},
+	// }
 	showConfigCmd = &cobra.Command{
 		Use:   "config",
 		Short: "Display the configuration file in key-value format",
@@ -207,6 +222,22 @@ var (
 			}
 		},
 	}
+	createCmd = &cobra.Command{
+		Use:   "create",
+		Short: "Create a new entity",
+		Long:  "",
+	}
+	createReservationCmd = &cobra.Command{
+		Use:   "reservation [flags]",
+		Short: "Create a new reservation",
+		Long:  "",
+		Args:  cobra.ExactArgs(0),
+		Run: func(cmd *cobra.Command, args []string) {
+			if err := CreateReservation(); err != util.ErrorSuccess {
+				os.Exit(err)
+			}
+		},
+	}
 )
 
 // ParseCmdArgs executes the root command.
@@ -228,6 +259,7 @@ func init() {
 		showCmd.AddCommand(showPartitionCmd)
 		showCmd.AddCommand(showJobCmd)
 		showCmd.AddCommand(showConfigCmd)
+		// showCmd.AddCommand(showReservationsCmd)
 	}
 
 	RootCmd.AddCommand(updateCmd)
@@ -251,9 +283,22 @@ func init() {
 			}
 		}
 	}
+
 	RootCmd.AddCommand(holdCmd)
 	{
 		holdCmd.Flags().StringVarP(&FlagHoldTime, "time", "t", "", "Specify the duration the job will be prevented from starting")
 	}
+
 	RootCmd.AddCommand(releaseCmd)
+
+	RootCmd.AddCommand(createCmd)
+	{
+		createCmd.AddCommand(createReservationCmd)
+		{
+			createReservationCmd.Flags().StringVarP(&FlagReservationName, "name", "n", "", "Specify the name of the reservation")
+			createReservationCmd.Flags().StringVarP(&FlagStartTime, "start-time", "s", "", "Specify the start time of the reservation")
+			createReservationCmd.Flags().StringVarP(&FlagDuration, "duration", "d", "", "Specify the duration of the reservation")
+			createReservationCmd.Flags().StringVarP(&FlagNodes, "nodes", "N", "", "Specify the nodes of the reservation")
+		}
+	}
 }

internal/ccontrol/ccontrol.go

@@ -32,6 +32,7 @@ import (
 	"strings"
 	"time"
 
+	"google.golang.org/protobuf/types/known/timestamppb"
 	"gopkg.in/yaml.v3"
 
 	log "github.com/sirupsen/logrus"
@@ -656,3 +657,39 @@ func ChangeNodeState(nodeRegex string, state string, reason string) util.CraneCm
 
 	return SummarizeReply(reply)
 }
+
+func CreateReservation() util.CraneCmdError {
+	start_time, err := util.ParseTime(FlagStartTime)
+	if err != nil {
+		log.Errorln(err)
+		return util.ErrorCmdArg
+	}
+
+	reservation_info := &protos.ReservationInfo{}
+	reservation_info.ReservationName = FlagReservationName
+	reservation_info.StartTime = timestamppb.New(start_time)
+	ok := util.ParseDuration(FlagDuration, reservation_info.Duration)
+	if !ok {
+		log.Errorln("Invalid duration specified.")
+		return util.ErrorCmdArg
+	}
+	reservation_info.CranedRegex = FlagNodes
+
+	req := &protos.CreateReservationRequest{
+		ReservationInfo: reservation_info,
+	}
+
+	reply, err := stub.CreateReservation(context.Background(), req)
+	if err != nil {
+		util.GrpcErrorPrintf(err, "Failed to create reservation")
+		return util.ErrorNetwork
+	}
+
+	if reply.GetOk() {
+		fmt.Printf("Reservation %s created successfully.\n", FlagReservationName)
+	} else {
+		log.Errorf("Failed to create reservation: %s.\n", reply.GetReason())
+		return util.ErrorBackend
+	}
+	return util.ErrorSuccess
+}

protos/Crane.proto

@@ -449,6 +449,35 @@ message QueryTasksInfoReply{
   repeated TaskInfo task_info_list = 2;
 }
 
+message CreateReservationRequest {
+  ReservationInfo reservation_info = 1;
+}
+
+message CreateReservationReply {
+  bool ok = 1;
+  string reason = 2;
+}
+
+// message DeleteReservationRequest {
+//   string reservation_name = 1;
+// }
+
+// message DeleteReservationReply {
+//   bool ok = 1;
+//   string reason = 2;
+// }
+
+// message QueryReservationRequest {
+//   repeated string filter_reservation_name = 1;
+//   uint32 num_limit = 3;
+// }
+
+// message QueryReservationReply {
+//   bool ok = 1;
+//   string reason = 2;
+//   repeated ReservationInfo reservation_info_list = 3;
+// }
+
 message StreamCallocRequest {
   enum CallocRequestType {
     TASK_REQUEST = 0;
@@ -794,6 +823,9 @@ service CraneCtld {
 
   /* common RPCs */
   rpc QueryTasksInfo(QueryTasksInfoRequest) returns (QueryTasksInfoReply);
+  rpc CreateReservation(CreateReservationRequest) returns (CreateReservationReply);
+  // rpc DeleteReservation(DeleteReservationRequest) returns (DeleteReservationReply);
+  // rpc QueryReservation(QueryReservationRequest) returns (QueryReservationReply);
 }
 
 service Craned {

protos/PublicDefs.proto

@@ -478,4 +478,11 @@ message CranedRemoteMeta {
   string craned_version = 3;
   google.protobuf.Timestamp craned_start_time = 4;
   google.protobuf.Timestamp system_boot_time = 5;
+}
+
+message ReservationInfo {
+  string reservation_name = 1;
+  google.protobuf.Timestamp start_time = 2;
+  google.protobuf.Duration duration = 3;
+  string craned_regex = 4;
 }