From 91454c8a60829e0f5239380c38a2fbefffea1058 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 13 Dec 2022 15:35:20 +0800 Subject: [PATCH] feat: remove callsystem and pattern (#1925) Signed-off-by: Gaius --- build/package/docs/dfcache/dfcache-delete.1 | 1 - build/package/docs/dfcache/dfcache-doc.1 | 1 - build/package/docs/dfcache/dfcache-export.1 | 1 - build/package/docs/dfcache/dfcache-import.1 | 1 - build/package/docs/dfcache/dfcache-plugin.1 | 1 - build/package/docs/dfcache/dfcache-stat.1 | 1 - build/package/docs/dfcache/dfcache-version.1 | 1 - build/package/docs/dfcache/dfcache.1 | 1 - build/package/docs/dfcache/dfcache.md | 1 - build/package/docs/dfcache/dfcache_delete.md | 1 - build/package/docs/dfcache/dfcache_doc.md | 1 - build/package/docs/dfcache/dfcache_export.md | 1 - build/package/docs/dfcache/dfcache_import.md | 1 - build/package/docs/dfcache/dfcache_plugin.md | 1 - build/package/docs/dfcache/dfcache_stat.md | 1 - build/package/docs/dfcache/dfcache_version.md | 1 - build/package/docs/dfget.1 | 1 - build/package/docs/dfget.1.md | 1 - client/config/constants.go | 7 ------ client/config/dfcache.go | 3 --- client/config/dfget.go | 5 ----- client/config/dfget_darwin.go | 1 - client/config/dfget_linux.go | 1 - client/config/peerhost.go | 22 ------------------- client/config/peerhost_darwin.go | 1 - client/config/peerhost_linux.go | 1 - client/config/peerhost_test.go | 1 - client/daemon/daemon.go | 10 ++++----- client/daemon/peer/peertask_file.go | 4 ---- client/daemon/peer/peertask_manager.go | 2 -- client/daemon/peer/peertask_manager_test.go | 5 ++--- client/daemon/peer/peertask_seed.go | 5 ++--- client/daemon/peer/peertask_stream.go | 2 -- client/daemon/proxy/proxy.go | 12 ---------- client/daemon/proxy/proxy_manager.go | 4 +--- client/daemon/rpcserver/rpcserver.go | 12 +--------- client/daemon/rpcserver/rpcserver_test.go | 6 +---- client/daemon/rpcserver/seeder.go | 5 ++--- client/daemon/transport/transport.go | 11 ---------- client/dfget/dfget.go | 1 - cmd/dfcache/cmd/root.go | 1 - cmd/dfget/cmd/root.go | 18 +++++---------- go.mod | 6 ++--- go.sum | 14 ++++++------ pkg/types/constants.go | 11 ---------- test/tools/download-grpc-test/main.go | 2 -- 46 files changed, 28 insertions(+), 163 deletions(-) diff --git a/build/package/docs/dfcache/dfcache-delete.1 b/build/package/docs/dfcache/dfcache-delete.1 index e45d162db..09e6cd4fd 100644 --- a/build/package/docs/dfcache/dfcache-delete.1 +++ b/build/package/docs/dfcache/dfcache-delete.1 @@ -18,7 +18,6 @@ dfcache delete <-i cid> [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-doc.1 b/build/package/docs/dfcache/dfcache-doc.1 index f9bd78430..c9355c700 100644 --- a/build/package/docs/dfcache/dfcache-doc.1 +++ b/build/package/docs/dfcache/dfcache-doc.1 @@ -18,7 +18,6 @@ dfcache doc [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-export.1 b/build/package/docs/dfcache/dfcache-export.1 index 8f6d80a63..95e370b5d 100644 --- a/build/package/docs/dfcache/dfcache-export.1 +++ b/build/package/docs/dfcache/dfcache-export.1 @@ -18,7 +18,6 @@ dfcache export <-i cid> |<-O output> [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-import.1 b/build/package/docs/dfcache/dfcache-import.1 index 292c76daf..ea215b57b 100644 --- a/build/package/docs/dfcache/dfcache-import.1 +++ b/build/package/docs/dfcache/dfcache-import.1 @@ -18,7 +18,6 @@ dfcache import <-i cid> |<-I file> [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-plugin.1 b/build/package/docs/dfcache/dfcache-plugin.1 index 5f6effe5f..0768372fc 100644 --- a/build/package/docs/dfcache/dfcache-plugin.1 +++ b/build/package/docs/dfcache/dfcache-plugin.1 @@ -18,7 +18,6 @@ dfcache plugin [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-stat.1 b/build/package/docs/dfcache/dfcache-stat.1 index c9495d3c6..d2ae5fb22 100644 --- a/build/package/docs/dfcache/dfcache-stat.1 +++ b/build/package/docs/dfcache/dfcache-stat.1 @@ -19,7 +19,6 @@ dfcache stat <-i cid> [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache-version.1 b/build/package/docs/dfcache/dfcache-version.1 index 4ea98a9e8..38d0cf8b3 100644 --- a/build/package/docs/dfcache/dfcache-version.1 +++ b/build/package/docs/dfcache/dfcache-version.1 @@ -18,7 +18,6 @@ dfcache version [flags] .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache.1 b/build/package/docs/dfcache/dfcache.1 index 89b89d1ec..24ea80396 100644 --- a/build/package/docs/dfcache/dfcache.1 +++ b/build/package/docs/dfcache/dfcache.1 @@ -22,7 +22,6 @@ network. .IP .nf \f[C] - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache.md b/build/package/docs/dfcache/dfcache.md index 92b85309a..97f837c05 100644 --- a/build/package/docs/dfcache/dfcache.md +++ b/build/package/docs/dfcache/dfcache.md @@ -18,7 +18,6 @@ responsibility to go back to source and add file into P2P network. ## OPTIONS ``` - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_delete.md b/build/package/docs/dfcache/dfcache_delete.md index a8bbfca2e..168ca8883 100644 --- a/build/package/docs/dfcache/dfcache_delete.md +++ b/build/package/docs/dfcache/dfcache_delete.md @@ -15,7 +15,6 @@ dfcache delete <-i cid> [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_doc.md b/build/package/docs/dfcache/dfcache_doc.md index aed12d7e7..16abee5dc 100644 --- a/build/package/docs/dfcache/dfcache_doc.md +++ b/build/package/docs/dfcache/dfcache_doc.md @@ -15,7 +15,6 @@ dfcache doc [flags] ## OPTIONS ``` - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_export.md b/build/package/docs/dfcache/dfcache_export.md index 111d06491..d1128f9a3 100644 --- a/build/package/docs/dfcache/dfcache_export.md +++ b/build/package/docs/dfcache/dfcache_export.md @@ -15,7 +15,6 @@ dfcache export <-i cid> |<-O output> [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_import.md b/build/package/docs/dfcache/dfcache_import.md index 45a9fc767..cf2963614 100644 --- a/build/package/docs/dfcache/dfcache_import.md +++ b/build/package/docs/dfcache/dfcache_import.md @@ -15,7 +15,6 @@ dfcache import <-i cid> |<-I file> [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_plugin.md b/build/package/docs/dfcache/dfcache_plugin.md index 7dfbe08ae..d7e3e328a 100644 --- a/build/package/docs/dfcache/dfcache_plugin.md +++ b/build/package/docs/dfcache/dfcache_plugin.md @@ -15,7 +15,6 @@ dfcache plugin [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_stat.md b/build/package/docs/dfcache/dfcache_stat.md index 0e88529b8..4b6e31a85 100644 --- a/build/package/docs/dfcache/dfcache_stat.md +++ b/build/package/docs/dfcache/dfcache_stat.md @@ -15,7 +15,6 @@ dfcache stat <-i cid> [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfcache/dfcache_version.md b/build/package/docs/dfcache/dfcache_version.md index 69038a2d5..8aa7aeafe 100644 --- a/build/package/docs/dfcache/dfcache_version.md +++ b/build/package/docs/dfcache/dfcache_version.md @@ -15,7 +15,6 @@ dfcache version [flags] ## OPTIONS ```shell - --callsystem string The caller name which is mainly used for statistics and access control -i, --cid string content or cache ID, e.g. sha256 digest of the content --config string the path of configuration file with yaml extension name, default is /etc/dragonfly/dfcache.yaml, it can also be set by env var: DFCACHE_CONFIG --console whether logger output records to the stdout diff --git a/build/package/docs/dfget.1 b/build/package/docs/dfget.1 index 4972a00dd..45233ae74 100644 --- a/build/package/docs/dfget.1 +++ b/build/package/docs/dfget.1 @@ -22,7 +22,6 @@ and so on. .nf \f[C] --accept-regex string Recursively download only. Specify a regular expression to accept the complete URL. In this case, you have to enclose the pattern into quotes to prevent your shell from expanding it - --callsystem string The caller name which is mainly used for statistics and access control --config string the path of configuration file with yaml extension name, it can also be set by env var: DFGET_CONFIG --console whether logger output records to the stdout --daemon-sock string Download socket path of daemon. In linux, default value is /var/run/dfdaemon.sock, in macos(just for testing), default value is /tmp/dfdaemon.sock diff --git a/build/package/docs/dfget.1.md b/build/package/docs/dfget.1.md index 596d08e95..58a4cb69c 100644 --- a/build/package/docs/dfget.1.md +++ b/build/package/docs/dfget.1.md @@ -15,7 +15,6 @@ functionality, such as network bandwidth limit, transmission encryption and so o ```shell --accept-regex string Recursively download only. Specify a regular expression to accept the complete URL. In this case, you have to enclose the pattern into quotes to prevent your shell from expanding it - --callsystem string The caller name which is mainly used for statistics and access control --config string the path of configuration file with yaml extension name, it can also be set by env var: DFGET_CONFIG --console whether logger output records to the stdout --daemon-sock string Download socket path of daemon. In linux, default value is /var/run/dfdaemon.sock, in macos(just for testing), default value is /tmp/dfdaemon.sock diff --git a/client/config/constants.go b/client/config/constants.go index 97ff0ef92..1c4ef61fc 100644 --- a/client/config/constants.go +++ b/client/config/constants.go @@ -38,13 +38,6 @@ const ( ForceNotBackSourceAddition = 1000 ) -// Download pattern. -const ( - PatternP2P = "p2p" - PatternSeedPeer = "seed-peer" - PatternSource = "source" -) - // Download limit. const ( DefaultPerPeerDownloadLimit = 512 * unit.MB diff --git a/client/config/dfcache.go b/client/config/dfcache.go index f33778756..6054f893e 100644 --- a/client/config/dfcache.go +++ b/client/config/dfcache.go @@ -49,9 +49,6 @@ type CacheOption struct { // Timeout operation timeout(second). Timeout time.Duration `yaml:"timeout,omitempty" mapstructure:"timeout,omitempty"` - // CallSystem optional system name - CallSystem string `yaml:"callSystem,omitempty" mapstructure:"callSystem,omitempty"` - // LogDir is log directory of dfcache. LogDir string `yaml:"logDir,omitempty" mapstructure:"logDir,omitempty"` diff --git a/client/config/dfget.go b/client/config/dfget.go index 2b77d9fa3..86573f847 100644 --- a/client/config/dfget.go +++ b/client/config/dfget.go @@ -73,11 +73,6 @@ type ClientOption struct { // DaemonSock is daemon download socket path. DaemonSock string `yaml:"daemonSock,omitempty" mapstructure:"daemon-sock,omitempty"` - // Deprecated: use Priority instead - // Pattern download pattern, must be 'p2p' or 'seed-peer' or 'source', - // default:`p2p`. - Pattern string `yaml:"pattern,omitempty" mapstructure:"pattern,omitempty"` - // Priority scheduler will schedule tasks according to priority Priority int32 `yaml:"priority,omitempty" mapstructure:"priority,omitempty"` diff --git a/client/config/dfget_darwin.go b/client/config/dfget_darwin.go index 62fb14e62..9ae536d0c 100644 --- a/client/config/dfget_darwin.go +++ b/client/config/dfget_darwin.go @@ -38,7 +38,6 @@ var dfgetConfig = ClientOption{ DigestValue: "", Tag: "", Application: "", - Pattern: "", Priority: 0, Cacerts: nil, Filter: "", diff --git a/client/config/dfget_linux.go b/client/config/dfget_linux.go index 672345a2c..4f26b81f3 100644 --- a/client/config/dfget_linux.go +++ b/client/config/dfget_linux.go @@ -36,7 +36,6 @@ var dfgetConfig = ClientOption{ DigestValue: "", Tag: "", Application: "", - Pattern: "", Priority: 0, Cacerts: nil, Filter: "", diff --git a/client/config/peerhost.go b/client/config/peerhost.go index 251f91bc6..9a1f4d031 100644 --- a/client/config/peerhost.go +++ b/client/config/peerhost.go @@ -36,7 +36,6 @@ import ( "d7y.io/dragonfly/v2/client/util" "d7y.io/dragonfly/v2/cmd/dependency/base" - logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/dfnet" "d7y.io/dragonfly/v2/pkg/net/ip" "d7y.io/dragonfly/v2/pkg/types" @@ -193,29 +192,9 @@ func (p *DaemonOption) Validate() error { return errors.New("reload interval too short, must great than 1 second") } - switch p.Download.DefaultPattern { - case PatternP2P, PatternSeedPeer, PatternSource: - default: - return errors.New("available pattern: p2p, seed-peer, source") - } return nil } -func ConvertPattern(p string, defaultPattern commonv1.Pattern) commonv1.Pattern { - switch p { - case PatternP2P: - return commonv1.Pattern_P2P - case PatternSeedPeer: - return commonv1.Pattern_SEED_PEER - case PatternSource: - return commonv1.Pattern_SOURCE - case "": - return defaultPattern - } - logger.Warnf("unknown pattern, use default pattern: %s", commonv1.Pattern_name[int32(defaultPattern)]) - return defaultPattern -} - type GlobalSecurityOption struct { // AutoIssueCert indicates to issue client certificates for all grpc call // if AutoIssueCert is false, any other option in Security will be ignored @@ -292,7 +271,6 @@ type HostOption struct { } type DownloadOption struct { - DefaultPattern string `mapstructure:"defaultPattern" yaml:"defaultPattern"` TotalRateLimit util.RateLimit `mapstructure:"totalRateLimit" yaml:"totalRateLimit"` PerPeerRateLimit util.RateLimit `mapstructure:"perPeerRateLimit" yaml:"perPeerRateLimit"` TrafficShaperType string `mapstructure:"trafficShaperType" yaml:"trafficShaperType"` diff --git a/client/config/peerhost_darwin.go b/client/config/peerhost_darwin.go index cfb3d0927..73f5bc1da 100644 --- a/client/config/peerhost_darwin.go +++ b/client/config/peerhost_darwin.go @@ -64,7 +64,6 @@ var peerHostConfig = func() *DaemonOption { NetTopology: "", }, Download: DownloadOption{ - DefaultPattern: PatternP2P, CalculateDigest: true, PieceDownloadTimeout: 30 * time.Second, GRPCDialTimeout: 10 * time.Second, diff --git a/client/config/peerhost_linux.go b/client/config/peerhost_linux.go index 127bd4cbd..aa84b38f8 100644 --- a/client/config/peerhost_linux.go +++ b/client/config/peerhost_linux.go @@ -64,7 +64,6 @@ var peerHostConfig = func() *DaemonOption { NetTopology: "", }, Download: DownloadOption{ - DefaultPattern: PatternP2P, CalculateDigest: true, PieceDownloadTimeout: 30 * time.Second, GRPCDialTimeout: 10 * time.Second, diff --git a/client/config/peerhost_test.go b/client/config/peerhost_test.go index de220a3e2..5a89d2943 100644 --- a/client/config/peerhost_test.go +++ b/client/config/peerhost_test.go @@ -291,7 +291,6 @@ func TestPeerHostOption_Load(t *testing.T) { AdvertiseIP: "0.0.0.0", }, Download: DownloadOption{ - DefaultPattern: PatternP2P, TotalRateLimit: util.RateLimit{ Limit: 1024 * 1024 * 1024, }, diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go index 1dec22fb0..310d139c8 100644 --- a/client/daemon/daemon.go +++ b/client/daemon/daemon.go @@ -40,7 +40,6 @@ import ( "google.golang.org/grpc/credentials/insecure" zapadapter "logur.dev/adapter/zap" - commonv1 "d7y.io/api/pkg/apis/common/v1" schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" @@ -123,9 +122,8 @@ func New(opt *config.DaemonOption, d dfpath.Dfpath) (Daemon, error) { } var ( - managerClient managerclient.Client - certifyClient *certify.Certify - defaultPattern = config.ConvertPattern(opt.Download.DefaultPattern, commonv1.Pattern_P2P) + managerClient managerclient.Client + certifyClient *certify.Certify ) if opt.Scheduler.Manager.Enable { @@ -288,13 +286,13 @@ func New(opt *config.DaemonOption, d dfpath.Dfpath) (Daemon, error) { peerServerOption = append(peerServerOption, grpc.Creds(tlsCredentials)) } - rpcManager, err := rpcserver.New(host, peerTaskManager, storageManager, defaultPattern, + rpcManager, err := rpcserver.New(host, peerTaskManager, storageManager, opt.Download.RecursiveConcurrent.GoroutineCount, opt.Download.CacheRecursiveMetadata, downloadServerOption, peerServerOption) if err != nil { return nil, err } - proxyManager, err := proxy.NewProxyManager(host, peerTaskManager, defaultPattern, opt.Proxy) + proxyManager, err := proxy.NewProxyManager(host, peerTaskManager, opt.Proxy) if err != nil { return nil, err } diff --git a/client/daemon/peer/peertask_file.go b/client/daemon/peer/peertask_file.go index c5a22a158..bdb0db427 100644 --- a/client/daemon/peer/peertask_file.go +++ b/client/daemon/peer/peertask_file.go @@ -39,7 +39,6 @@ type FileTaskRequest struct { Output string Limit float64 DisableBackSource bool - Callsystem string Range *util.Range KeepOriginalOffset bool } @@ -63,8 +62,6 @@ type fileTask struct { // disableBackSource indicates not back source when failed disableBackSource bool - pattern string - callsystem string } type ProgressState struct { @@ -113,7 +110,6 @@ func (ptm *peerTaskManager) newFileTask( progressCh: make(chan *FileTaskProgress), progressStopCh: make(chan bool), disableBackSource: request.DisableBackSource, - callsystem: request.Callsystem, } return ctx, pt, nil } diff --git a/client/daemon/peer/peertask_manager.go b/client/daemon/peer/peertask_manager.go index fd8d334e6..4099d6078 100644 --- a/client/daemon/peer/peertask_manager.go +++ b/client/daemon/peer/peertask_manager.go @@ -270,7 +270,6 @@ func (ptm *peerTaskManager) prefetchParentTask(request *schedulerv1.PeerTaskRequ PeerHost: ptm.PeerHost, HostLoad: request.HostLoad, IsMigrating: request.IsMigrating, - Pattern: request.Pattern, UrlMeta: &commonv1.UrlMeta{ Digest: request.UrlMeta.Digest, Tag: request.UrlMeta.Tag, @@ -342,7 +341,6 @@ func (ptm *peerTaskManager) StartStreamTask(ctx context.Context, req *StreamTask PeerHost: ptm.PeerHost, HostLoad: nil, IsMigrating: false, - Pattern: req.Pattern, } if ptm.Multiplex { diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go index 90d02852b..1eac62955 100644 --- a/client/daemon/peer/peertask_manager_test.go +++ b/client/daemon/peer/peertask_manager_test.go @@ -776,9 +776,8 @@ func (ts *testSpec) runSeedTaskTest(_ *testifyassert.Assertions, require *testif HostLoad: nil, IsMigrating: false, }, - Limit: 0, - Callsystem: "", - Range: nil, + Limit: 0, + Range: nil, }) require.Nil(err, "start seed peer task") diff --git a/client/daemon/peer/peertask_seed.go b/client/daemon/peer/peertask_seed.go index 95d5fbc8d..e8c2a7a6e 100644 --- a/client/daemon/peer/peertask_seed.go +++ b/client/daemon/peer/peertask_seed.go @@ -31,9 +31,8 @@ import ( type SeedTaskRequest struct { schedulerv1.PeerTaskRequest - Limit float64 - Callsystem string - Range *util.Range + Limit float64 + Range *util.Range } type SeedTaskResponse struct { diff --git a/client/daemon/peer/peertask_stream.go b/client/daemon/peer/peertask_stream.go index 713724c0b..d2fd7a3ef 100644 --- a/client/daemon/peer/peertask_stream.go +++ b/client/daemon/peer/peertask_stream.go @@ -45,8 +45,6 @@ type StreamTaskRequest struct { Range *util.Range // peer's id and must be global uniqueness PeerID string - // Pattern to register to scheduler - Pattern commonv1.Pattern } // StreamTask represents a peer task with stream io for reading directly without once more disk io diff --git a/client/daemon/proxy/proxy.go b/client/daemon/proxy/proxy.go index 7ee3dda96..6e998fd49 100644 --- a/client/daemon/proxy/proxy.go +++ b/client/daemon/proxy/proxy.go @@ -104,9 +104,6 @@ type Proxy struct { // defaultApplication is used when http request without X-Dragonfly-Application Header defaultApplication string - // DEPRECATED - defaultPattern commonv1.Pattern - // defaultPriority is used for scheduling defaultPriority commonv1.Priority @@ -249,14 +246,6 @@ func WithDefaultPriority(priority commonv1.Priority) Option { } } -// WithDefaultPattern sets default pattern for downloading -func WithDefaultPattern(pattern commonv1.Pattern) Option { - return func(p *Proxy) *Proxy { - p.defaultPattern = pattern - return p - } -} - // WithBasicAuth sets basic auth info for proxy func WithBasicAuth(auth *config.BasicAuth) Option { return func(p *Proxy) *Proxy { @@ -527,7 +516,6 @@ func (proxy *Proxy) newTransport(tlsConfig *tls.Config) http.RoundTripper { transport.WithTLS(tlsConfig), transport.WithCondition(proxy.shouldUseDragonfly), transport.WithDefaultFilter(proxy.defaultFilter), - transport.WithDefaultPattern(proxy.defaultPattern), transport.WithDefaultTag(proxy.defaultTag), transport.WithDefaultApplication(proxy.defaultApplication), transport.WithDefaultPriority(proxy.defaultPriority), diff --git a/client/daemon/proxy/proxy_manager.go b/client/daemon/proxy/proxy_manager.go index dc4c4cbf1..b4242ac6e 100644 --- a/client/daemon/proxy/proxy_manager.go +++ b/client/daemon/proxy/proxy_manager.go @@ -32,7 +32,6 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v3" - commonv1 "d7y.io/api/pkg/apis/common/v1" schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" @@ -60,7 +59,7 @@ type proxyManager struct { var _ Manager = (*proxyManager)(nil) -func NewProxyManager(peerHost *schedulerv1.PeerHost, peerTaskManager peer.TaskManager, defaultPattern commonv1.Pattern, proxyOption *config.ProxyOption) (Manager, error) { +func NewProxyManager(peerHost *schedulerv1.PeerHost, peerTaskManager peer.TaskManager, proxyOption *config.ProxyOption) (Manager, error) { // proxy is option, when nil, just disable it if proxyOption == nil { logger.Infof("proxy config is empty, disabled") @@ -82,7 +81,6 @@ func NewProxyManager(peerHost *schedulerv1.PeerHost, peerTaskManager peer.TaskMa WithDefaultTag(proxyOption.DefaultTag), WithDefaultApplication(proxyOption.DefaultApplication), WithDefaultPriority(proxyOption.DefaultPriority), - WithDefaultPattern(defaultPattern), WithBasicAuth(proxyOption.BasicAuth), WithDumpHTTPContent(proxyOption.DumpHTTPContent), } diff --git a/client/daemon/rpcserver/rpcserver.go b/client/daemon/rpcserver/rpcserver.go index 055671bc9..494c96d7d 100644 --- a/client/daemon/rpcserver/rpcserver.go +++ b/client/daemon/rpcserver/rpcserver.go @@ -79,7 +79,6 @@ type server struct { peerHost *schedulerv1.PeerHost peerTaskManager peer.TaskManager storageManager storage.Manager - defaultPattern commonv1.Pattern downloadServer *grpc.Server peerServer *grpc.Server @@ -96,15 +95,13 @@ func init() { } func New(peerHost *schedulerv1.PeerHost, peerTaskManager peer.TaskManager, - storageManager storage.Manager, defaultPattern commonv1.Pattern, - recursiveConcurrent int, cacheRecursiveMetadata time.Duration, + storageManager storage.Manager, recursiveConcurrent int, cacheRecursiveMetadata time.Duration, downloadOpts []grpc.ServerOption, peerOpts []grpc.ServerOption) (Server, error) { s := &server{ KeepAlive: util.NewKeepAlive("rpc server"), peerHost: peerHost, peerTaskManager: peerTaskManager, storageManager: storageManager, - defaultPattern: defaultPattern, recursiveConcurrent: recursiveConcurrent, cacheRecursiveMetadata: cacheRecursiveMetadata, @@ -443,7 +440,6 @@ func (s *server) recursiveDownloadWithP2PMetadata( URL: purl.String(), URLMeta: &urlMeta, PeerID: idgen.PeerID(s.peerHost.Ip), - Pattern: config.ConvertPattern(req.Pattern, s.defaultPattern), }) if err != nil { log.Errorf("start stream task for metadata error: %s", err) @@ -656,8 +652,6 @@ func copyDownRequest(req *dfdaemonv1.DownRequest) *dfdaemonv1.DownRequest { Limit: req.Limit, DisableBackSource: req.DisableBackSource, UrlMeta: req.UrlMeta, - Pattern: req.Pattern, - Callsystem: req.Callsystem, Uid: req.Uid, Gid: req.Gid, KeepOriginalOffset: req.KeepOriginalOffset, @@ -700,12 +694,10 @@ func (s *server) download(ctx context.Context, req *dfdaemonv1.DownRequest, stre UrlMeta: req.UrlMeta, PeerId: peerID, PeerHost: s.peerHost, - Pattern: config.ConvertPattern(req.Pattern, s.defaultPattern), }, Output: req.Output, Limit: req.Limit, DisableBackSource: req.DisableBackSource, - Callsystem: req.Callsystem, KeepOriginalOffset: req.KeepOriginalOffset, } if len(req.UrlMeta.Range) > 0 { @@ -959,8 +951,6 @@ func (s *server) exportFromPeers(ctx context.Context, log *logger.SugaredLoggerO Limit: req.Limit, DisableBackSource: true, UrlMeta: req.UrlMeta, - Pattern: "", - Callsystem: req.Callsystem, Uid: req.Uid, Gid: req.Gid, } diff --git a/client/daemon/rpcserver/rpcserver_test.go b/client/daemon/rpcserver/rpcserver_test.go index 21c7cc1ef..187c30c9f 100644 --- a/client/daemon/rpcserver/rpcserver_test.go +++ b/client/daemon/rpcserver/rpcserver_test.go @@ -71,10 +71,9 @@ func TestServer_New(t *testing.T) { mockpeerHost := &schedulerv1.PeerHost{} mockpeerTaskManager := peer.NewMockTaskManager(ctrl) mockStorageManger := mocks.NewMockManager(ctrl) - var defaultPattern commonv1.Pattern = 0 var mockdownloadOpts []grpc.ServerOption var mockpeerOpts []grpc.ServerOption - _, err := New(mockpeerHost, mockpeerTaskManager, mockStorageManger, defaultPattern, 16, 0, mockdownloadOpts, mockpeerOpts) + _, err := New(mockpeerHost, mockpeerTaskManager, mockStorageManger, 16, 0, mockdownloadOpts, mockpeerOpts) tc.expect(t, err) }) } @@ -216,7 +215,6 @@ func TestServer_ExportTask(t *testing.T) { UrlMeta: &commonv1.UrlMeta{ Tag: "unit test", }, - Callsystem: "", }, mock: func(mockStorageManger *mocks.MockManagerMockRecorder, mockTaskManager *peer.MockTaskManagerMockRecorder, mocktsd *mocks.MockTaskStorageDriver, mockPieceManager *peer.MockPieceManager) { mockStorageManger.FindCompletedTask(gomock.Any()).Return(nil) @@ -690,8 +688,6 @@ func TestServer_ServeDownload(t *testing.T) { UrlMeta: &commonv1.UrlMeta{ Tag: "unit test", }, - Pattern: "p2p", - Callsystem: "", } down, err := client.Download(context.Background(), request) assert.Nil(err, "client download grpc call should be ok") diff --git a/client/daemon/rpcserver/seeder.go b/client/daemon/rpcserver/seeder.go index 4a33de1bf..b657479a0 100644 --- a/client/daemon/rpcserver/seeder.go +++ b/client/daemon/rpcserver/seeder.go @@ -74,9 +74,8 @@ func (s *seeder) ObtainSeeds(seedRequest *cdnsystemv1.SeedRequest, seedsServer c HostLoad: nil, IsMigrating: false, }, - Limit: 0, - Callsystem: "", - Range: nil, // following code will update Range + Limit: 0, + Range: nil, // following code will update Range } log := logger.With("peer", req.PeerId, "task", seedRequest.TaskId, "component", "seedService") diff --git a/client/daemon/transport/transport.go b/client/daemon/transport/transport.go index bcdb37e23..5186ec069 100644 --- a/client/daemon/transport/transport.go +++ b/client/daemon/transport/transport.go @@ -72,9 +72,6 @@ type transport struct { // defaultFilter is used when http request without X-Dragonfly-Filter Header defaultFilter string - // defaultFilter is used for registering steam task - defaultPattern commonv1.Pattern - // defaultTag is used when http request without X-Dragonfly-Tag Header defaultTag string @@ -133,14 +130,6 @@ func WithDefaultFilter(f string) Option { } } -// WithDefaultPattern sets default pattern -func WithDefaultPattern(pattern commonv1.Pattern) Option { - return func(rt *transport) *transport { - rt.defaultPattern = pattern - return rt - } -} - // WithDefaultTag sets default tag for http requests with X-Dragonfly-Tag Header func WithDefaultTag(b string) Option { return func(rt *transport) *transport { diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 0a211923d..f3ad5df13 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -242,7 +242,6 @@ func newDownRequest(cfg *config.DfgetConfig, hdr map[string]string) *dfdaemonv1. Application: cfg.Application, Priority: commonv1.Priority(cfg.Priority), }, - Pattern: cfg.Pattern, Uid: int64(os.Getuid()), Gid: int64(os.Getgid()), KeepOriginalOffset: cfg.KeepOriginalOffset, diff --git a/cmd/dfcache/cmd/root.go b/cmd/dfcache/cmd/root.go index e6adfa01a..72b59a8ff 100644 --- a/cmd/dfcache/cmd/root.go +++ b/cmd/dfcache/cmd/root.go @@ -82,7 +82,6 @@ func init() { flags.StringP("cid", "i", "", "content or cache ID, e.g. sha256 digest of the content") flags.StringP("tag", "t", "", "different tags for the same cid will be recognized as different files in P2P network") flags.Duration("timeout", dfcacheConfig.Timeout, "Timeout for this cache operation, 0 is infinite") - flags.String("callsystem", dfcacheConfig.CallSystem, "The caller name which is mainly used for statistics and access control") flags.String("workhome", dfcacheConfig.WorkHome, "Dfcache working directory") flags.String("logdir", dfcacheConfig.LogDir, "Dfcache log directory") diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go index 7d914e037..8a64faa85 100644 --- a/cmd/dfget/cmd/root.go +++ b/cmd/dfget/cmd/root.go @@ -41,7 +41,6 @@ import ( "d7y.io/dragonfly/v2/pkg/os/user" "d7y.io/dragonfly/v2/pkg/rpc/dfdaemon/client" "d7y.io/dragonfly/v2/pkg/source" - "d7y.io/dragonfly/v2/pkg/types" "d7y.io/dragonfly/v2/pkg/unit" "d7y.io/dragonfly/v2/version" ) @@ -158,11 +157,6 @@ func init() { flagSet.Bool("disable-back-source", dfgetConfig.DisableBackSource, "Disable downloading directly from source when the daemon fails to download file") - flagSet.StringP("pattern", "p", dfgetConfig.Pattern, "The downloading pattern: p2p/seed-peer/source") - if err := flagSet.MarkDeprecated("pattern", "please use --priority instead"); err != nil { - panic(err) - } - flagSet.Int32P("priority", "P", dfgetConfig.Priority, "Scheduler will schedule task according to priority") flagSet.BoolP("show-progress", "b", dfgetConfig.ShowProgress, "Show progress bar, it conflicts with --console") @@ -235,13 +229,11 @@ func runDfget(dfgetLockPath, daemonSockPath string) error { err error ) - if dfgetConfig.Pattern != types.SourcePattern { - logger.Info("start to check and spawn daemon") - if dfdaemonClient, err = checkAndSpawnDaemon(dfgetLockPath, daemonSockPath); err != nil { - logger.Errorf("check and spawn daemon error: %v", err) - } else { - logger.Info("check and spawn daemon success") - } + logger.Info("start to check and spawn daemon") + if dfdaemonClient, err = checkAndSpawnDaemon(dfgetLockPath, daemonSockPath); err != nil { + logger.Errorf("check and spawn daemon error: %v", err) + } else { + logger.Info("check and spawn daemon success") } return dfget.Download(dfgetConfig, dfdaemonClient) diff --git a/go.mod b/go.mod index d7b50eccf..2f1daecf4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2 go 1.19 require ( - d7y.io/api v1.3.9 + d7y.io/api v1.4.0 github.com/RichardKnop/machinery v1.10.6 github.com/Showmax/go-fqdn v1.0.0 github.com/VividCortex/mysqlerr v1.0.0 @@ -104,7 +104,7 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/envoyproxy/protoc-gen-validate v0.9.0 // indirect + github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-echarts/go-echarts/v2 v2.2.4 // indirect @@ -206,7 +206,7 @@ require ( golang.org/x/net v0.2.0 // indirect golang.org/x/term v0.3.0 // indirect golang.org/x/text v0.4.0 // indirect - golang.org/x/tools v0.2.0 // indirect + golang.org/x/tools v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 94654f0fd..5f4c55454 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -d7y.io/api v1.3.9 h1:u5HgSTLDz/hMtDN4Ha9JI6KKFfBOfBbSe2nd+Cz94Tc= -d7y.io/api v1.3.9/go.mod h1:HERD+sbavL0vJXkd37RZxJvpu+nXZ6ipffm4EFUbF2w= +d7y.io/api v1.4.0 h1:KXjKfHpqZdy+kuwK7vo1WA2kHApaZnqwO5xWsPtkI80= +d7y.io/api v1.4.0/go.mod h1:nxtfwYYTCN7Mvx79lLk8xUfvldIUDyzYIfgOmyln+8M= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= @@ -255,8 +255,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.9.0 h1:wyv+mWIshClA4g6hTlKD9xb6fiNAnDu3+8qYf7KSuSE= -github.com/envoyproxy/protoc-gen-validate v0.9.0/go.mod h1:aUb/JIPT9p8VQ1hMxCrB3/NZSvKoF7fPIE1ULgCIVz0= +github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= +github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= @@ -1291,7 +1291,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1-0.20210830214625-1b1db11ec8f4/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1601,8 +1601,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM= +golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/types/constants.go b/pkg/types/constants.go index 5aa363ebc..29004f08d 100644 --- a/pkg/types/constants.go +++ b/pkg/types/constants.go @@ -39,17 +39,6 @@ const ( DfstoreName = "dfstore" ) -const ( - // SourcePattern is back-to-source download pattern. - SourcePattern = "source" - - // SeedPeerPattern is seed peer download pattern. - SeedPeerPattern = "seed-peer" - - // P2PPattern is p2p download pattern. - P2PPattern = "p2p" -) - const ( // MetricsNamespace is namespace of metrics. MetricsNamespace = "dragonfly" diff --git a/test/tools/download-grpc-test/main.go b/test/tools/download-grpc-test/main.go index 3d2ed2d00..8dfa75c7b 100644 --- a/test/tools/download-grpc-test/main.go +++ b/test/tools/download-grpc-test/main.go @@ -69,8 +69,6 @@ func main() { "awsS3ForcePathStyle": "true", }, }, - Pattern: "", - Callsystem: "", Uid: 1000, // target uid Gid: 1000, // target gid KeepOriginalOffset: false,