Skip to content

Commit

Permalink
Storage drivers setup for datatx (#3915)
Browse files Browse the repository at this point in the history
* * Datatx(transfers) and rclone(jobs) storage drivers setup

* Configurations for storage drivers

* Some clarification on cancelling transfers in the tutorial

* Remove transfer-create cli command, must use ocm-share-create instead

* Remove unnecessary logging

---------

Co-authored-by: Antoon P <antoon@redblom.com>
  • Loading branch information
redblom and antoonp authored May 30, 2023
1 parent 1096964 commit 3a761e3
Show file tree
Hide file tree
Showing 14 changed files with 777 additions and 508 deletions.
4 changes: 4 additions & 0 deletions changelog/unreleased/datatx-storage-drivers.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Enhancement: Storage drivers setup for datatx

https://github.com/cs3org/reva/pull/3915
https://github.com/cs3org/reva/issues/3914
1 change: 0 additions & 1 deletion cmd/reva/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ var (
shareUpdateCommand(),
shareListReceivedCommand(),
shareUpdateReceivedCommand(),
transferCreateCommand(),
transferGetStatusCommand(),
transferCancelCommand(),
transferListCommand(),
Expand Down
146 changes: 0 additions & 146 deletions cmd/reva/transfer-create.go

This file was deleted.

4 changes: 3 additions & 1 deletion docs/content/en/docs/tutorials/datatx-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,6 @@ remove_transfer_on_cancel = true
[grpc.services.datatx.txdrivers.rclone]
remove_transfer_job_on_cancel = true
```
Currently this setting is recommended.
Currently this setting is recommended.

*Note that with these settings `transfer-cancel` will remove transfers & jobs even when a transfer cannot actually be cancelled because it was already in an end-state, eg. `finished` or `failed`. So `transfer-cancel` will act like a 'delete' function.
18 changes: 12 additions & 6 deletions examples/datatx/datatx.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ data_transfers_folder = ""
[grpc.services.datatx]
# rclone is currently the only data transfer driver implementation
txdriver = "rclone"
# the shares,transfers db file (default: /var/tmp/reva/datatx-shares.json)
tx_shares_file = ""
# base folder of the data transfers (eg. /home/DataTransfers)
data_transfers_folder = ""
# the storage driver
storagedriver = "json"
# if set to 'true' the transfer will always be removed from the db upon cancel request
# recommended value is true
remove_transfer_on_cancel = true
Expand All @@ -30,16 +28,24 @@ auth_pass = "{rclone user secret}"
# "x-access-token" will result in rclone using request header: X-Access-Token: "...token..."
# If not set "bearer" is assumed
auth_header = "x-access-token"
# 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
# the storage driver
storagedriver = "json"
# if set to 'true' the transfer job will always be removed from the db upon transfer cancel request
# recommended value is true
remove_transfer_job_on_cancel = true

[grpc.services.datatx.storagedrivers.json]
# the datatx transfers db file (defaults to: /var/tmp/reva/datatx-transfers.json)
file = ""

[grpc.services.datatx.txdrivers.rclone.storagedrivers.json]
# the transfers jobs db file (defaults to: /var/tmp/reva/transfer-jobs.json)
file = ""

[http.services.ocdav]
# reva supports http third party copy
enable_http_tpc = true
Expand Down
Loading

0 comments on commit 3a761e3

Please sign in to comment.