-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
1,652 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Enhancement: New CS3API datatx methods | ||
|
|
||
| CS3 datatx pull model methods: PullTransfer, RetryTransfer, ListTransfers | ||
| Method CreateTransfer removed. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2052 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Copyright 2018-2021 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "encoding/gob" | ||
| "io" | ||
| "os" | ||
|
|
||
| rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" | ||
| ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" | ||
| datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" | ||
| "github.com/jedib0t/go-pretty/table" | ||
| ) | ||
|
|
||
| func transferListCommand() *command { | ||
| cmd := newCommand("transfer-list") | ||
| cmd.Description = func() string { return "get a list of transfers" } | ||
| cmd.Usage = func() string { return "Usage: transfer-list [-flags]" } | ||
| filterShareID := cmd.String("shareId", "", "share ID filter (optional)") | ||
|
|
||
| cmd.Action = func(w ...io.Writer) error { | ||
| ctx := getAuthContext() | ||
| client, err := getClient() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // validate flags | ||
| var filters []*datatx.ListTransfersRequest_Filter | ||
| if *filterShareID != "" { | ||
| filters = append(filters, &datatx.ListTransfersRequest_Filter{ | ||
| Type: datatx.ListTransfersRequest_Filter_TYPE_SHARE_ID, | ||
| Term: &datatx.ListTransfersRequest_Filter_ShareId{ | ||
| ShareId: &ocm.ShareId{ | ||
| OpaqueId: *filterShareID, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| transferslistRequest := &datatx.ListTransfersRequest{ | ||
| Filters: filters, | ||
| } | ||
|
|
||
| listTransfersResponse, err := client.ListTransfers(ctx, transferslistRequest) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if listTransfersResponse.Status.Code != rpc.Code_CODE_OK { | ||
| return formatError(listTransfersResponse.Status) | ||
| } | ||
|
|
||
| if len(w) == 0 { | ||
| t := table.NewWriter() | ||
| t.SetOutputMirror(os.Stdout) | ||
| t.AppendHeader(table.Row{"ShareId.OpaqueId", "Id.OpaqueId"}) | ||
|
|
||
| for _, s := range listTransfersResponse.Transfers { | ||
| t.AppendRows([]table.Row{ | ||
| {s.ShareId.OpaqueId, s.Id.OpaqueId}, | ||
| }) | ||
| } | ||
| t.Render() | ||
| } else { | ||
| enc := gob.NewEncoder(w[0]) | ||
| if err := enc.Encode(listTransfersResponse.Transfers); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| return cmd | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Copyright 2018-2021 CERN | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // In applying this license, CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "encoding/gob" | ||
| "errors" | ||
| "io" | ||
| "os" | ||
| "time" | ||
|
|
||
| rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" | ||
| datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" | ||
| "github.com/jedib0t/go-pretty/table" | ||
| ) | ||
|
|
||
| func transferRetryCommand() *command { | ||
| cmd := newCommand("transfer-retry") | ||
| cmd.Description = func() string { return "retry a transfer" } | ||
| cmd.Usage = func() string { return "Usage: transfer-retry [-flags]" } | ||
| txID := cmd.String("txId", "", "the transfer identifier") | ||
|
|
||
| cmd.Action = func(w ...io.Writer) error { | ||
| // validate flags | ||
| if *txID == "" { | ||
| return errors.New("txId must be specified: use -txId flag\n" + cmd.Usage()) | ||
| } | ||
|
|
||
| ctx := getAuthContext() | ||
| client, err := getClient() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| retryRequest := &datatx.RetryTransferRequest{ | ||
| TxId: &datatx.TxId{ | ||
| OpaqueId: *txID, | ||
| }, | ||
| } | ||
|
|
||
| retryResponse, err := client.RetryTransfer(ctx, retryRequest) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if retryResponse.Status.Code != rpc.Code_CODE_OK { | ||
| return formatError(retryResponse.Status) | ||
| } | ||
|
|
||
| if len(w) == 0 { | ||
| t := table.NewWriter() | ||
| t.SetOutputMirror(os.Stdout) | ||
| t.AppendHeader(table.Row{"ShareId.OpaqueId", "Id.OpaqueId", "Status", "Ctime"}) | ||
| cTime := time.Unix(int64(retryResponse.TxInfo.Ctime.Seconds), int64(retryResponse.TxInfo.Ctime.Nanos)) | ||
| t.AppendRows([]table.Row{ | ||
| {retryResponse.TxInfo.ShareId.OpaqueId, retryResponse.TxInfo.Id.OpaqueId, retryResponse.TxInfo.Status, cTime}, | ||
| }) | ||
| t.Render() | ||
| } else { | ||
| enc := gob.NewEncoder(w[0]) | ||
| if err := enc.Encode(retryResponse.TxInfo); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| return cmd | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # example data transfer service configuration | ||
| [grpc.services.datatx] | ||
| # rclone is the default data transfer driver | ||
| txdriver = "rclone" | ||
| # the shares,transfers db file (default: /var/tmp/reva/datatx-shares.json) | ||
| tx_shares_file = "" | ||
| # base folder of the data transfers (default: /home/DataTransfers) | ||
| data_transfers_folder = "" | ||
|
|
||
| # rclone data transfer driver | ||
| [grpc.services.datatx.txdrivers.rclone] | ||
| # rclone endpoint | ||
| endpoint = "http://..." | ||
| # basic auth is used | ||
| auth_user = "...rcloneuser" | ||
| auth_pass = "...rcloneusersecret" | ||
| # the transfers(jobs) db file (default: /var/tmp/reva/datatx-transfers.json) | ||
| file = "" | ||
| # check status job interval in milliseconds | ||
| job_status_check_interval = 2000 | ||
| # the job timeout in milliseconds (must be long enough for big transfers!) | ||
| job_timeout = 120000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.