[feat]tools-v2: add update copyset availflag #2455

baytan0720 · 2023-05-05T10:48:12Z

What problem does this PR solve?

Issue Number: #2357

Problem Summary: support update availflag command in curve tool

What is changed and how it works?

What's Changed:
add tools-v2/pkg/cli/command/curvebs/list/unavailcopysets/unavailcopysets.go
add tools-v2/pkg/cli/command/curvebs/query/chunk/chunkinfo.go
add tools-v2/pkg/cli/command/curvebs/list/chunkserver/copyset_by_host.go
add tools-v2/pkg/cli/command/curvebs/set/set.go
add tools-v2/pkg/cli/command/curvebs/update/copyset/copyset.go
add tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go
modify tools-v2/internal/error/error.go
modify tools-v2/internal/utils/row.go
modify tools-v2/pkg/cli/command/curvebs/bs.go
modify tools-v2/pkg/config/bs.go
modify tools-v2/pkg/cli/command/curvebs/update/update.go
modify tools-v2/pkg/cli/command/curvebs/check/copyset/copyset.go

How it Works:

root@0ad49a8af612:/# curve bs update copyset-availflag -h               
Usage:  curve bs update copyset-availflag [flags]

set copyset availflag

Flags:
      --availflag             copysets available flag[required]
  -c, --conf string           config file (default is
                              $HOME/.curve/curve.yaml or
                              /etc/curve/curve.yaml)
      --dryrun                when dry run set true, no changes will be
                              made (default true)
  -f, --format string         output format (json|plain) (default "plain")
  -h, --help                  print help
      --mdsaddr string        mds address, should be like
                              127.0.0.1:6700,127.0.0.1:6701,127.0.0.1:6702
      --rpcretrytimes int32   rpc retry times (default 1)
      --rpctimeout duration   rpc timeout (default 10s)
      --showerror             display all errors in command
      --verbose               show some log

Examples:
$ curve bs update copyset-availflag --availflag=true --dryrun=false

Side effects(Breaking backward compatibility? Performance regression?):

Check List

Relevant documentation/comments is changed or added
I acknowledge that all my contributions will be made under the project's license

aspirer

we also need to update doc in tools-v2/README.md.

you can refer to pr #2465

aspirer · 2023-05-11T08:07:40Z

tools-v2/internal/error/error.go

@@ -420,7 +420,18 @@ var (
 	ErrBsOpNameNotSupport = func() *CmdError {
 		return NewInternalCmdError(53, "not support op[%s], only support: operator, change_peer, add_peer, remove_peer, transfer_leader")
 	}
-
+	ErrBsGetChunkServerInCluster = func() *CmdError {
+		return NewInternalCmdError(53, "get chunkserver in cluster fail, err: %s")


the errorno 53 is already used above, we should start with errorno 54.

aspirer · 2023-05-11T08:25:22Z

tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go

+)
+
+const (
+	copysetAvailflagExample = `$ curve bs update copyset availflag --availflag=true --dryrun=false`


set or update?
you use set in conversation, I think it should be update, we should correct it.

baytan0720 · 2023-05-11T08:39:28Z

we also need to update doc in tools-v2/README.md.

you can refer to pr #2465

Ok, I will fix all. This pr is not ready yet. I've been a little busy lately.

Cyber-SiKu · 2023-05-16T07:07:07Z

tools-v2/pkg/config/bs.go

+	CURVEBS_CHUNKSERVER_ADDRESS       = "csaddress"
+	VIPER_CURVEBS_CHUNKSERVER_ADDRESS = "curvebs.csaddress"


Suggested change

CURVEBS_CHUNKSERVER_ADDRESS = "csaddress"

VIPER_CURVEBS_CHUNKSERVER_ADDRESS = "curvebs.csaddress"

CURVEBS_CHUNKSERVER_ADDRESS = "chunkserveraddr"

VIPER_CURVEBS_CHUNKSERVER_ADDRESS = "curvebs.chunkserverAddr"

Cyber-SiKu · 2023-05-16T07:11:52Z

tools-v2/pkg/cli/command/curvebs/list/chunkserver/chunkserver.go

+type ChunkserverCommand struct {
+	basecmd.FinalCurveCmd
+	Rpc      *GetChunkServerInClusterRpc
+	response *topology.GetChunkServerInClusterResponse


Suggested change

response *topology.GetChunkServerInClusterResponse

ChunkServerInfos []*topology.ChunkServerInfo

is better?

Cyber-SiKu · 2023-05-16T07:12:19Z

tools-v2/pkg/cli/command/curvebs/list/unavailcopysets/unavailcopysets.go

+type UnAvailCopySetsCommand struct {
+	basecmd.FinalCurveCmd
+	Rpc      *ListUnAvailCopySets
+	response *topology.ListUnAvailCopySetsResponse


Cyber-SiKu · 2023-05-16T07:13:32Z

tools-v2/pkg/cli/command/curvebs/query/chunk/chunkinfo.go

@@ -0,0 +1,167 @@
+/*
+ *  Copyright (c) 2022 NetEase Inc.


Suggested change

* Copyright (c) 2022 NetEase Inc.

* Copyright (c) 2023 NetEase Inc.

Cyber-SiKu · 2023-05-16T07:13:42Z

tools-v2/pkg/cli/command/curvebs/list/chunkserver/chunkserver.go

@@ -0,0 +1,131 @@
+/*
+ *  Copyright (c) 2022 NetEase Inc.


Suggested change

* Copyright (c) 2022 NetEase Inc.

* Copyright (c) 2023 NetEase Inc.

Cyber-SiKu · 2023-05-16T07:16:21Z

tools-v2/pkg/cli/command/curvebs/query/chunk/chunkinfo.go

+				CopysetId:   &copysetIds[i],
+				ChunkId:     &chunkIds[i],
+			},
+			Info: &basecmd.Rpc{[]string{addressList[i]}, timeout, retrytimes, "GetChunkInfo"},


Suggested change

Info: &basecmd.Rpc{[]string{addressList[i]}, timeout, retrytimes, "GetChunkInfo"},

Info: &basecmd.NewRpc{[]string{addressList[i]}, timeout, retrytimes, "GetChunkInfo"},

Cyber-SiKu · 2023-05-16T07:19:11Z

tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go

@@ -0,0 +1,259 @@
+/*
+ *  Copyright (c) 2022 NetEase Inc.


Suggested change

* Copyright (c) 2022 NetEase Inc.

* Copyright (c) 2023 NetEase Inc.

Cyber-SiKu · 2023-05-16T07:19:20Z

tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go

@@ -0,0 +1,259 @@
+/*


add use in readme

opencurveadmin · 2023-05-22T07:30:51Z

@Cyber-SiKu PTAL

lng2020 · 2023-05-22T13:55:09Z

tools-v2/pkg/cli/command/curvebs/list/chunkserver/chunkserver.go

this file has been implemented as chunkserver_cluster.go in the latest master branch. If necessary, use that.

lng2020 · 2023-05-22T13:56:42Z

tools-v2/pkg/cli/command/curvebs/query/chunk/chunkinfo.go

What's this file for? chunk is a different concept from chunkserver

lng2020 · 2023-05-22T13:59:56Z

tools-v2/pkg/cli/command/curvebs/query/copyset/copyset_in_chunkserver.go

list/chunkserver/copyset.go in current master do the same thing, use the current one.

Cyber-SiKu · 2023-05-22T06:34:05Z

tools-v2/pkg/cli/command/curvebs/list/chunkserver/chunkserver.go

@@ -0,0 +1,132 @@
+/*


You can directly use chunkserver.go
Or migrate it over here and modify it according to your needs.

Cyber-SiKu · 2023-05-22T06:41:43Z

tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go

+			row[cobrautil.ROW_POOL_ID] = strconv.FormatUint(uint64(info.GetLogicalPoolId()), 10)
+			row[cobrautil.ROW_COPYSET_ID] = strconv.FormatUint(uint64(info.GetCopysetId()), 10)
+			row[cobrautil.ROW_AVAILFLAG] = fmt.Sprintf("%v => %v", !*cCmd.Rpc.Request.AvailFlag, *cCmd.Rpc.Request.AvailFlag)
+			row[cobrautil.ROW_DRYRUN] = "true"


Suggested change

row[cobrautil.ROW_DRYRUN] = "true"

row[cobrautil.ROW_DRYRUN] = cobrautil.ROW_VALUE_TRUE

Cyber-SiKu · 2023-05-22T06:42:01Z

tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go

+			row[cobrautil.ROW_POOL_ID] = strconv.FormatUint(uint64(info.GetLogicalPoolId()), 10)
+			row[cobrautil.ROW_COPYSET_ID] = strconv.FormatUint(uint64(info.GetCopysetId()), 10)
+			row[cobrautil.ROW_AVAILFLAG] = fmt.Sprintf("%v => %v", !*cCmd.Rpc.Request.AvailFlag, *cCmd.Rpc.Request.AvailFlag)
+			row[cobrautil.ROW_DRYRUN] = "false"


Suggested change

row[cobrautil.ROW_DRYRUN] = "false"

row[cobrautil.ROW_DRYRUN] = ROW_VALUE_FALSE

baytan0720 · 2023-06-02T16:58:43Z

cicheck

Signed-off-by: baytan0720 <baytan2@hotmail.com>

baytan0720 · 2023-06-02T17:06:56Z

cicheck

done

baytan0720 marked this pull request as draft May 5, 2023 10:48

baytan0720 changed the title ~~[feat]tools-v2: add set availflag~~ [feat]tools-v2: add set copyset-availflag May 5, 2023

zhanghuidinah requested a review from Cyber-SiKu May 8, 2023 03:20

baytan0720 force-pushed the availflag branch 2 times, most recently from 99a7afa to 0c358b5 Compare May 8, 2023 04:14

Cyber-SiKu marked this pull request as ready for review May 8, 2023 08:07

aspirer previously requested changes May 11, 2023

View reviewed changes

baytan0720 changed the title ~~[feat]tools-v2: add set copyset-availflag~~ [feat]tools-v2: add update copyset availflag May 11, 2023

zhanghuidinah added the Developer Activities label May 15, 2023

Cyber-SiKu reviewed May 16, 2023

View reviewed changes

baytan0720 force-pushed the availflag branch 3 times, most recently from c9d5cee to cc9f6cb Compare May 17, 2023 10:15

zhanghuidinah requested a review from Cyber-SiKu May 19, 2023 02:47

lng2020 reviewed May 22, 2023

View reviewed changes

baytan0720 force-pushed the availflag branch from cc9f6cb to 8dc7fa8 Compare May 23, 2023 13:39

Cyber-SiKu reviewed May 24, 2023

View reviewed changes

baytan0720 force-pushed the availflag branch from 8dc7fa8 to bbd734b Compare June 2, 2023 16:58

[feat]tools-v2: add update copyset availflag

5ba5dcd

Signed-off-by: baytan0720 <baytan2@hotmail.com>

baytan0720 force-pushed the availflag branch from bbd734b to 5ba5dcd Compare June 2, 2023 17:03

baytan0720 requested a review from Cyber-SiKu June 2, 2023 17:03

Cyber-SiKu approved these changes Jun 5, 2023

View reviewed changes

SeanHai approved these changes Jun 5, 2023

View reviewed changes

Cyber-SiKu merged commit 26a51f0 into opencurve:master Jun 5, 2023
3 checks passed

baytan0720 deleted the availflag branch June 5, 2023 07:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[feat]tools-v2: add update copyset availflag #2455

[feat]tools-v2: add update copyset availflag #2455

baytan0720 commented May 5, 2023 •

edited

aspirer left a comment

aspirer May 11, 2023

aspirer May 11, 2023

baytan0720 commented May 11, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

Cyber-SiKu May 16, 2023

opencurveadmin commented May 22, 2023

lng2020 May 22, 2023

lng2020 May 22, 2023

lng2020 May 22, 2023

Cyber-SiKu May 22, 2023

Cyber-SiKu May 22, 2023

Cyber-SiKu May 22, 2023

baytan0720 commented Jun 2, 2023

baytan0720 commented Jun 2, 2023

		CURVEBS_CHUNKSERVER_ADDRESS = "csaddress"
		VIPER_CURVEBS_CHUNKSERVER_ADDRESS = "curvebs.csaddress"

	response *topology.GetChunkServerInClusterResponse
	ChunkServerInfos []*topology.ChunkServerInfo

	* Copyright (c) 2022 NetEase Inc.
	* Copyright (c) 2023 NetEase Inc.

	Info: &basecmd.Rpc{[]string{addressList[i]}, timeout, retrytimes, "GetChunkInfo"},
	Info: &basecmd.NewRpc{[]string{addressList[i]}, timeout, retrytimes, "GetChunkInfo"},

	row[cobrautil.ROW_DRYRUN] = "true"
	row[cobrautil.ROW_DRYRUN] = cobrautil.ROW_VALUE_TRUE

	row[cobrautil.ROW_DRYRUN] = "false"
	row[cobrautil.ROW_DRYRUN] = ROW_VALUE_FALSE

[feat]tools-v2: add update copyset availflag #2455

[feat]tools-v2: add update copyset availflag #2455

Conversation

baytan0720 commented May 5, 2023 • edited

What problem does this PR solve?

What is changed and how it works?

Check List

aspirer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

baytan0720 commented May 11, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

opencurveadmin commented May 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

baytan0720 commented Jun 2, 2023

baytan0720 commented Jun 2, 2023

baytan0720 commented May 5, 2023 •

edited