From 7b502cbaaea76fa5221bab2f5276b74581d44735 Mon Sep 17 00:00:00 2001 From: pengweisong <90180021+pengweisong@users.noreply.github.com> Date: Mon, 14 Feb 2022 12:02:07 +0800 Subject: [PATCH 1/3] fix cleanup console --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27c2019..3a57ba8 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ bin/br version For example: ```bash # for local - br cleanup --meta "127.0.0.1:9559" --s3.endpoint "http://127.0.0.1:9000" --storage="local:///home/nebula/backup/" --name BACKUP_2021_12_08_18_38_08 + br cleanup --meta "127.0.0.1:9559" --storage="local:///home/nebula/backup/" --name BACKUP_2021_12_08_18_38_08 # for s3 br cleanup --meta "127.0.0.1:9559" --s3.endpoint "http://127.0.0.1:9000" --storage="s3://br-test/backup/" --s3.access_key=minioadmin --s3.secret_key=minioadmin --name=BACKUP_2021_12_08_18_38_08 From ca98175d1cda0249c667a1ead1fc0f55422b2198 Mon Sep 17 00:00:00 2001 From: pengweisong <90180021+pengweisong@users.noreply.github.com> Date: Mon, 14 Feb 2022 17:23:13 +0800 Subject: [PATCH 2/3] add debug flag in readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3a57ba8..b5f2557 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ bin/br version --s3.endpoint string S3 Option: set the S3 endpoint URL, please specify the http or https scheme explicitly --s3.region string S3 Option: set region or location to upload or download backup --s3.secret_key string S3 Option: set secret key for access id + --debug Output log in debug level or not ``` For example, the command below will conduct a full backup operation of entire cluster whose meta service's address is `127.0.0.1:9559`, upload the backup files to local `/home/nebula/backup` or S3 URL `s3://127.0.0.1:9000/br-test/backup`. @@ -103,6 +104,7 @@ bin/br version example: for local - "local:///the/local/path/to/backup" for s3 - "s3://example/url/to/the/backup" + --debug Output log in debug level or not ``` For example, the command below will list the information of existing backups in local path `/home/nebula/backup` or S3 URL `s3://127.0.0.1:9000/br-test/backup` @@ -150,6 +152,7 @@ bin/br version --s3.endpoint string S3 Option: set the S3 endpoint URL, please specify the http or https scheme explicitly --s3.region string S3 Option: set region or location to upload or download backup --s3.secret_key string S3 Option: set secret key for access id + --debug Output log in debug level or not ``` For example, the command below will conduct a restore operation, which restore to the cluster whose meta service address is `127.0.0.1:9559`, from local disk in path `/home/nebula/backup/BACKUP_2021_12_08_18_38_08` or s3 URL `s3://127.0.0.1:9000/br-test/backupu/BACKUP_2021_12_08_18_38_08` @@ -186,6 +189,7 @@ bin/br version --s3.endpoint string S3 Option: set the S3 endpoint URL, please specify the http or https scheme explicitly --s3.region string S3 Option: set region or location to upload or download backup --s3.secret_key string S3 Option: set secret key for access id + --debug Output log in debug level or not ``` For example: From be5723da9ba7e1a04eb5f2a4c43fc59eed001a29 Mon Sep 17 00:00:00 2001 From: pengweisong <90180021+pengweisong@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:15:00 +0800 Subject: [PATCH 3/3] update nebula agent dependency --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8870472..586830d 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/spf13/cobra v1.1.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - github.com/vesoft-inc/nebula-agent v0.1.1-0.20220208095610-fe80654911f8 - github.com/vesoft-inc/nebula-go/v3 v3.0.0-20220119024722-ab348afbb79d + github.com/vesoft-inc/nebula-agent v0.1.1 + github.com/vesoft-inc/nebula-go/v3 v3.0.0 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect ) diff --git a/go.sum b/go.sum index fc9dbb3..312fb3d 100644 --- a/go.sum +++ b/go.sum @@ -223,10 +223,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/vesoft-inc/nebula-agent v0.1.1-0.20220208095610-fe80654911f8 h1:UY7ygJyfzpYWIsdLpLJTf1yjh3FhW8xRYBNQg1OL77o= -github.com/vesoft-inc/nebula-agent v0.1.1-0.20220208095610-fe80654911f8/go.mod h1:uA6GJsvhNdTZkLQp1grX74fUm6TWi7EWA2AEWNeHzNU= -github.com/vesoft-inc/nebula-go/v3 v3.0.0-20220119024722-ab348afbb79d h1:spO7OAtYI1wiqBiJ9417pKhqx0IkqFAFdFQFPm4JIrs= -github.com/vesoft-inc/nebula-go/v3 v3.0.0-20220119024722-ab348afbb79d/go.mod h1:+sXv05jYQBARdTbTcIEsWVXCnF/6ttOlDK35xQ6m54s= +github.com/vesoft-inc/nebula-agent v0.1.1 h1:HGrKJV02uLQydgBTn8/eVdyxkY3cLGC1B5ra/xet52Y= +github.com/vesoft-inc/nebula-agent v0.1.1/go.mod h1:JovCbyojVT665zWtlsss9SL9cVX969XKkZKO3NhrcMQ= +github.com/vesoft-inc/nebula-go/v3 v3.0.0 h1:ii5T3vps4xAQZkzPvGn6NuiUWlH/rm1zdIS5VTEA71A= +github.com/vesoft-inc/nebula-go/v3 v3.0.0/go.mod h1:+sXv05jYQBARdTbTcIEsWVXCnF/6ttOlDK35xQ6m54s= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=