Skip to content

Commit

Permalink
Typos, part 3
Browse files Browse the repository at this point in the history
Fix typos in pkg and testing related files.

Refs: #3966
Signed-off-by: Yaniv Kaul <[email protected]>
  • Loading branch information
mykaul committed Aug 15, 2024
1 parent d89ca2b commit b367473
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pkg/callhome/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pkg/command/cluster/clusteradd/cmd_integration_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/command/info/cmd_integration_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions pkg/command/repair/cmd_api_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/command/tasks/cmd_integration_api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/downloader/downloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/scyllaclient/client_ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/scyllaclient/client_rclone_agent_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/scyllaclient/client_rclone_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/scyllaclient/client_rclone_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/scyllaclient/client_scylla.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/service/backup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.<br/>
`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.<br/>

```go
func (s *Service) GetTarget(ctx context.Context, clusterID uuid.UUID, properties json.RawMessage)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/workerpool/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions testing/scylla/scylla-sm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
# skip_wait_for_gossip_to_settle: 0

0 comments on commit b367473

Please sign in to comment.