Merge branch 'master' into feature/enum-zero

Author: alexshtin

tools/cli/admin.go

@@ -170,7 +170,44 @@ func newAdminShardManagementCommands() []cli.Command {
 				AdminDescribeTask(c)
 			},
 		},
-
+		{
+			Name:  "list_tasks",
+			Usage: "List tasks for given shard Id and task type",
+			Flags: append(
+				getDBFlags(),
+				cli.StringFlag{
+					Name:  FlagTargetCluster,
+					Value: "active",
+					Usage: "Temporal cluster to use",
+				},
+				cli.IntFlag{
+					Name:  FlagShardID,
+					Usage: "The ID of the shard",
+				},
+				cli.IntFlag{
+					Name:  FlagTaskType,
+					Value: 2,
+					Usage: "Task type: 2 - transfer task (default), 3 - timer task, 4 - replication task",
+				},
+				cli.StringFlag{
+					Name:  FlagMinVisibilityTimestamp,
+					Value: "2020-01-01T00:00:00+00:00",
+					Usage: "Task visibility min timestamp. Supported formats are '2006-01-02T15:04:05+07:00', raw UnixNano and " +
+						"time range (N<duration>), where 0 < N < 1000000 and duration (full-notation/short-notation) can be second/s, " +
+						"minute/m, hour/h, day/d, week/w, month/M or year/y. For example, '15minute' or '15m' implies last 15 minutes.",
+				},
+				cli.StringFlag{
+					Name:  FlagMaxVisibilityTimestamp,
+					Value: "2035-01-01T00:00:00+00:00",
+					Usage: "Task visibility max timestamp. Supported formats are '2006-01-02T15:04:05+07:00', raw UnixNano and " +
+						"time range (N<duration>), where 0 < N < 1000000 and duration (full-notation/short-notation) can be second/s, " +
+						"minute/m, hour/h, day/d, week/w, month/M or year/y. For example, '15minute' or '15m' implies last 15 minutes.",
+				},
+			),
+			Action: func(c *cli.Context) {
+				AdminListTasks(c)
+			},
+		},
 		{
 			Name:    "close_shard",
 			Aliases: []string{"clsh"},

tools/cli/adminCommands.go

@@ -408,6 +408,48 @@ func AdminDescribeTask(c *cli.Context) {
 	}
 }
 
+// AdminListTasks outputs a list of a tasks for given Shard and Task Type
+func AdminListTasks(c *cli.Context) {
+	sid := getRequiredIntOption(c, FlagShardID)
+	category := commongenpb.TaskCategory(c.Int(FlagTaskType))
+
+	pFactory := CreatePersistenceFactory(c)
+	executionManager, err := pFactory.NewExecutionManager(sid)
+	if err != nil {
+		ErrorAndExit("Failed to initialize execution manager", err)
+	}
+
+	if category == commongenpb.TaskCategory_TaskCategory_Transfer {
+		req := &persistence.GetTransferTasksRequest{}
+		tasks, err := executionManager.GetTransferTasks(req)
+		if err != nil {
+			ErrorAndExit("Failed to get Transfer Tasks", err)
+		}
+		prettyPrintJSONObject(tasks)
+	} else if category == commongenpb.TaskCategory_TaskCategory_Timer {
+		minVisFlag := parseTime(c.String(FlagMinVisibilityTimestamp), 0, time.Now())
+		minVis := time.Unix(0, minVisFlag)
+		maxVisFlag := parseTime(c.String(FlagMaxVisibilityTimestamp), 0, time.Now())
+		maxVis := time.Unix(0, maxVisFlag)
+
+		req := &persistence.GetTimerIndexTasksRequest{MinTimestamp: minVis, MaxTimestamp: maxVis}
+		tasks, err := executionManager.GetTimerIndexTasks(req)
+		if err != nil {
+			ErrorAndExit("Failed to get Timer Tasks", err)
+		}
+		prettyPrintJSONObject(tasks)
+	} else if category == commongenpb.TaskCategory_TaskCategory_Replication {
+		req := &persistence.GetReplicationTasksRequest{}
+		task, err := executionManager.GetReplicationTasks(req)
+		if err != nil {
+			ErrorAndExit("Failed to get Replication Tasks", err)
+		}
+		prettyPrintJSONObject(task)
+	} else {
+		ErrorAndExit("Failed to describe task", fmt.Errorf("Unrecognized task type, task_type=%v", category))
+	}
+}
+
 // AdminRemoveTask describes history host
 func AdminRemoveTask(c *cli.Context) {
 	adminClient := cFactory.AdminClient(c)

tools/cli/flags.go

@@ -197,6 +197,8 @@ const (
 	FlagTaskID                            = "task_id"
 	FlagTaskType                          = "task_type"
 	FlagTaskVisibilityTimestamp           = "task_timestamp"
+	FlagMinVisibilityTimestamp            = "min_visibility_ts"
+	FlagMaxVisibilityTimestamp            = "max_visibility_ts"
 	FlagStartingRPS                       = "starting_rps"
 	FlagRPS                               = "rps"
 	FlagRPSScaleUpSeconds                 = "rps_scale_up_seconds"