diff --git a/pkg/callhome/doc.go b/pkg/callhome/doc.go index 01a78266b7..a0a1b59df3 100644 --- a/pkg/callhome/doc.go +++ b/pkg/callhome/doc.go @@ -22,7 +22,7 @@ status - allowed values are per-machine-uuid - uuid of the machine that manager is running on the-registration-uuid - uuid of the registration unique to registered user -scylla-manager-version - version of the Scylla Manger +scylla-manager-version - version of the Scylla Manager rtype - linux distribution id (ubuntu, debian, rehl, centos, fedora, unknown) */ package callhome diff --git a/pkg/command/cluster/clusteradd/cmd_integration_api_test.go b/pkg/command/cluster/clusteradd/cmd_integration_api_test.go index dd10e1168c..9c327b13c7 100644 --- a/pkg/command/cluster/clusteradd/cmd_integration_api_test.go +++ b/pkg/command/cluster/clusteradd/cmd_integration_api_test.go @@ -83,7 +83,7 @@ func TestSctoolClusterAddIntegrationAPITest(t *testing.T) { // given client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } cmd := exec.Command("./sctool.api-tests", tc.args...) var stderr bytes.Buffer diff --git a/pkg/command/cluster/clusterlist/cmd_integration_api_test.go b/pkg/command/cluster/clusterlist/cmd_integration_api_test.go index f5b55f10ec..206000b5c3 100644 --- a/pkg/command/cluster/clusterlist/cmd_integration_api_test.go +++ b/pkg/command/cluster/clusterlist/cmd_integration_api_test.go @@ -54,7 +54,7 @@ func TestSctoolClusterListIntegrationAPITest(t *testing.T) { // given client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } clusterID, err := client.CreateCluster(context.Background(), tc.createCluster) diff --git a/pkg/command/cluster/clusterupdate/cmd_integration_api_test.go b/pkg/command/cluster/clusterupdate/cmd_integration_api_test.go index 93ac10e7c9..bc3c074e3b 100644 --- a/pkg/command/cluster/clusterupdate/cmd_integration_api_test.go +++ b/pkg/command/cluster/clusterupdate/cmd_integration_api_test.go @@ -105,7 +105,7 @@ func TestSctoolClusterUpdateIntegrationAPITest(t *testing.T) { // given client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } fillCluster := func(c *models.Cluster) { diff --git a/pkg/command/info/cmd_integration_api_test.go b/pkg/command/info/cmd_integration_api_test.go index 3e64a14d8f..e881cce1bb 100644 --- a/pkg/command/info/cmd_integration_api_test.go +++ b/pkg/command/info/cmd_integration_api_test.go @@ -24,7 +24,7 @@ const ( func TestSctoolInfoLabelsIntegrationAPITest(t *testing.T) { client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } clusterID, err := client.CreateCluster(context.Background(), &models.Cluster{ diff --git a/pkg/command/repair/cmd_api_integration_test.go b/pkg/command/repair/cmd_api_integration_test.go index 311da488d8..798a92c680 100644 --- a/pkg/command/repair/cmd_api_integration_test.go +++ b/pkg/command/repair/cmd_api_integration_test.go @@ -26,7 +26,7 @@ const ( func TestSctoolRepairLabelIntegrationAPITest(t *testing.T) { client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } clusterID, err := client.CreateCluster(context.Background(), &models.Cluster{ @@ -71,7 +71,7 @@ func TestSctoolRepairLabelIntegrationAPITest(t *testing.T) { task, err := client.GetTask(context.Background(), clusterID, "repair", taskID) if err != nil { - t.Fatalf("Unable to get updated task wtih client, err = {%v}", err) + t.Fatalf("Unable to get updated task with client, err = {%v}", err) } if !maps.Equal(task.Labels, map[string]string{ diff --git a/pkg/command/tasks/cmd_integration_api_test.go b/pkg/command/tasks/cmd_integration_api_test.go index 174c37a1fe..940bd59499 100644 --- a/pkg/command/tasks/cmd_integration_api_test.go +++ b/pkg/command/tasks/cmd_integration_api_test.go @@ -25,7 +25,7 @@ const ( func TestSctoolTasksLabelsIntegrationAPITest(t *testing.T) { client, err := managerclient.NewClient("http://localhost:5080/api/v1") if err != nil { - t.Fatalf("Unable to create managerclient to consume managet HTTP API, err = {%v}", err) + t.Fatalf("Unable to create managerclient to consume manager HTTP API, err = {%v}", err) } clusterID, err := client.CreateCluster(context.Background(), &models.Cluster{ diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go index 31c67e23eb..9ed2e9095b 100644 --- a/pkg/downloader/downloader.go +++ b/pkg/downloader/downloader.go @@ -146,7 +146,7 @@ func (d *Downloader) download(ctx context.Context, m backup.ManifestInfoWithCont if usage.Free == nil { d.logger.Info(ctx, "Failed to get free bytes", "usage", usage) } else if *usage.Free < size { - return errors.Errorf("not enought disk space free %s required %s", fs.SizeSuffix(*usage.Free), fs.SizeSuffix(size)) + return errors.Errorf("not enough disk space free %s required %s", fs.SizeSuffix(*usage.Free), fs.SizeSuffix(size)) } f := func(i int) error { diff --git a/pkg/scyllaclient/client_ping.go b/pkg/scyllaclient/client_ping.go index b1deb2fa42..f38a84a184 100644 --- a/pkg/scyllaclient/client_ping.go +++ b/pkg/scyllaclient/client_ping.go @@ -59,7 +59,7 @@ func (c *Client) GetNodesWithLocationAccess(ctx context.Context, nodes NodeStatu if len(checked) == 0 { combinedErr := multierr.Combine(nodeErr...) - return nil, errors.Wrapf(combinedErr, "no nodes with access to loaction: %s", remotePath) + return nil, errors.Wrapf(combinedErr, "no nodes with access to location: %s", remotePath) } return checked, nil diff --git a/pkg/scyllaclient/client_rclone_agent_integration_test.go b/pkg/scyllaclient/client_rclone_agent_integration_test.go index 86e9e27ece..f47e7592bc 100644 --- a/pkg/scyllaclient/client_rclone_agent_integration_test.go +++ b/pkg/scyllaclient/client_rclone_agent_integration_test.go @@ -169,7 +169,7 @@ func TestRcloneDeletePathsInBatchesAgentIntegration(t *testing.T) { Printf("And: validate that the only files left are %v", tc.after) } if err := validateDir(ctx, client, testHost, remote, tc.after); err != nil { - t.Error(errors.Wrapf(err, "%s: validate dir conetnt after paths deletion", remote)) + t.Error(errors.Wrapf(err, "%s: validate dir content after paths deletion", remote)) } } diff --git a/pkg/scyllaclient/client_rclone_integration_test.go b/pkg/scyllaclient/client_rclone_integration_test.go index 5c9a46ccc8..61b4453322 100644 --- a/pkg/scyllaclient/client_rclone_integration_test.go +++ b/pkg/scyllaclient/client_rclone_integration_test.go @@ -56,7 +56,7 @@ func TestRcloneLocalToS3CopyDirIntegration(t *testing.T) { } Print("And: 2 files are transferred") if len(job.Transferred) != 2 { - t.Errorf("Expected 2 transfered files got %d", len(job.Transferred)) + t.Errorf("Expected 2 transferred files got %d", len(job.Transferred)) } for _, r := range job.Transferred { if r.Error != "" { diff --git a/pkg/scyllaclient/client_rclone_test.go b/pkg/scyllaclient/client_rclone_test.go index 8351d6eb88..0dfa236e9d 100644 --- a/pkg/scyllaclient/client_rclone_test.go +++ b/pkg/scyllaclient/client_rclone_test.go @@ -376,7 +376,7 @@ func TestRcloneListDirIterCancelContext(t *testing.T) { err := client.RcloneListDirIter(ctx, scyllaclienttest.TestHost, "rclonetest:list", nil, f) if !errors.Is(err, context.Canceled) { - t.Fatalf("RcloneListDirIter() error %s, expected context cancelation", err) + t.Fatalf("RcloneListDirIter() error %s, expected context cancellation", err) } if len(files) != 1 { t.Fatalf("Files = %+v, expected one item", files) diff --git a/pkg/scyllaclient/client_scylla.go b/pkg/scyllaclient/client_scylla.go index 0706ac0f04..63b877089e 100644 --- a/pkg/scyllaclient/client_scylla.go +++ b/pkg/scyllaclient/client_scylla.go @@ -338,7 +338,7 @@ func (c *Client) ShardCount(ctx context.Context, host string) (uint, error) { } if _, ok := metrics[metricName]; !ok { - return 0, errors.Errorf("scylla doest not expose %s metric", metricName) + return 0, errors.Errorf("scylla does not expose %s metric", metricName) } shards := len(metrics[metricName].Metric) @@ -862,7 +862,7 @@ func (c *Client) TotalMemory(ctx context.Context, host string) (int64, error) { } if _, ok := metrics[metricName]; !ok { - return 0, errors.New("scylla doest not expose total memory metric") + return 0, errors.New("scylla does not expose total memory metric") } var totalMemory int64 diff --git a/pkg/service/backup/README.md b/pkg/service/backup/README.md index 843e39e7be..4bb72b13c6 100644 --- a/pkg/service/backup/README.md +++ b/pkg/service/backup/README.md @@ -20,7 +20,7 @@ Entrypoint on the backup service that starts the process of backing up the data func (s *Service) Backup(ctx context.Context, clusterID, taskID, runID uuid.UUID, target Target) error ``` -`target.Target` defines the backup. It contains information about what to backup, where to backup, what is the retention policy, what paralelism must be used and how to rate limit.
+`target.Target` defines the backup. It contains information about what to backup, where to backup, what is the retention policy, what parallelism must be used and how to rate limit.
```go func (s *Service) GetTarget(ctx context.Context, clusterID uuid.UUID, properties json.RawMessage) diff --git a/pkg/util/workerpool/pool.go b/pkg/util/workerpool/pool.go index 02f438f8d0..116abb5f74 100644 --- a/pkg/util/workerpool/pool.go +++ b/pkg/util/workerpool/pool.go @@ -15,7 +15,7 @@ type JobHandler[T, R any] interface { Done(ctx context.Context) } -// Pool allows for executing homogenous JobHandlers with ongoing control over parallelism. +// Pool allows for executing homogeneous JobHandlers with ongoing control over parallelism. // Use Spawn, Kill and SetSize methods to change the current amount of workers. // Use Submit to submit new task and Results to wait for the results. // Pool can be closed with Close or drained with cancelling workers context. diff --git a/testing/Makefile b/testing/Makefile index 89646985ea..3d9b888f3e 100644 --- a/testing/Makefile +++ b/testing/Makefile @@ -55,7 +55,7 @@ build: ## Build custom docker image up: ## Start docker containers up: @echo "==> Starting testing env with SCYLLA_VERSION=$(SCYLLA_VERSION) and IP_FAMILY=$(IP_FAMILY) and RAFT_SCHEMA=$(RAFT_SCHEMA) and TABLETS=$(TABLETS)" -# Scylla bootstap proceedure have requirements that leads us to follow certain recipe: +# Scylla bootstrap procedure have requirements that leads us to follow certain recipe: # 1. Spin up first node on the cluster # 2. Spin up and join other seed node, which is first node from DC2 # 3. Spin up rest of the nodes diff --git a/testing/scylla/scylla-sm.yaml b/testing/scylla/scylla-sm.yaml index 3037a31ddc..fd49d332b2 100644 --- a/testing/scylla/scylla-sm.yaml +++ b/testing/scylla/scylla-sm.yaml @@ -24,7 +24,7 @@ num_tokens: 256 # Directory where Scylla should store all its files, which are commitlog, # data, hints, view_hints and saved_caches subdirectories. All of these -# subs can be overriden by the respective options below. +# subs can be overridden by the respective options below. # If unset, the value defaults to /var/lib/scylla # workdir: /var/lib/scylla @@ -385,7 +385,7 @@ commitlog_total_space_in_mb: -1 # tombstones seen in memory so we can return them to the coordinator, which # will use them to make sure other replicas also know about the deleted rows. # With workloads that generate a lot of tombstones, this can cause performance -# problems and even exaust the server heap. +# problems and even exhaust the server heap. # (http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets) # Adjust the thresholds here if you understand the dangers and want to # scan more tombstones anyway. These thresholds may also be adjusted at runtime @@ -397,7 +397,7 @@ commitlog_total_space_in_mb: -1 # Increase if your rows are large, or if you have a very large # number of rows per partition. The competing goals are these: # 1) a smaller granularity means more index entries are generated -# and looking up rows withing the partition by collation column +# and looking up rows within the partition by collation column # is faster # 2) but, Scylla will keep the collation index in memory for hot # rows (as part of the key cache), so a larger granularity means @@ -498,7 +498,7 @@ commitlog_total_space_in_mb: -1 # not met, performance and reliability can be degraded. # # These requirements include: -# - A filesystem with good support for aysnchronous I/O (AIO). Currently, +# - A filesystem with good support for asynchronous I/O (AIO). Currently, # this means XFS. # # false: strict environment checks are in place; do not start if they are not met. @@ -535,7 +535,7 @@ commitlog_total_space_in_mb: -1 # [shard0] [shard1] ... [shardN-1] [shard0] [shard1] ... [shardN-1] ... # # Scylla versions 1.6 and below used just one repetition of the pattern; -# this intefered with data placement among nodes (vnodes). +# this interfered with data placement among nodes (vnodes). # # Scylla versions 1.7 and above use 4096 repetitions of the pattern; this # provides for better data distribution. @@ -629,4 +629,4 @@ api_doc_dir: /usr/lib/scylla/api/api-doc/ alternator_port: 8000 alternator_write_isolation: only_rmw_uses_lwt enable_ipv6_dns_lookup: true -# skip_wait_for_gossip_to_settle: 0 \ No newline at end of file +# skip_wait_for_gossip_to_settle: 0