-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix: grep seaweedfs bucket name instead of using awk #4076
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+41
−2
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,33 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| source _unit-test/_test_setup.sh | ||
| source install/dc-detect-version.sh | ||
| source install/create-docker-volumes.sh | ||
|
|
||
| start_service_and_wait_ready seaweedfs | ||
|
|
||
| $dcx seaweedfs apk add --no-cache s3cmd | ||
| s3cmd="$dc exec seaweedfs s3cmd" | ||
|
|
||
| # Create multiple buckets for testing | ||
| buckets=(bucket1 bucket2 bucket3) | ||
| for bucket in "${buckets[@]}"; do | ||
| $s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' mb s3://$bucket | ||
| done | ||
|
|
||
| # Verify that all buckets were created successfully | ||
| bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls) | ||
| for bucket in "${buckets[@]}"; do | ||
| if ! echo "$bucket_list" | grep -q "s3://$bucket"; then | ||
| echo "Error: Bucket s3://$bucket was not created successfully." | ||
| exit 1 | ||
| fi | ||
| done | ||
|
|
||
| # Can find "bucket2" | ||
| if ! echo "$bucket_list" | grep -q "s3://bucket2"; then | ||
| echo "Error: Bucket s3://bucket2 was not found." | ||
| exit 1 | ||
| fi | ||
|
|
||
| report_success |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ s3cmd="$dc exec seaweedfs s3cmd" | |
|
|
||
| bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls) | ||
|
|
||
| if [[ $(echo "$bucket_list" | tail -1 | awk '{print $3}') != 's3://nodestore' ]]; then | ||
| if echo "$bucket_list" | grep -q "s3://nodestore"; then | ||
|
||
| apply_config_changes_nodestore=0 | ||
| # Only touch if no existing nodestore config is found | ||
| if ! grep -q "SENTRY_NODESTORE" $SENTRY_CONFIG_PY; then | ||
|
|
||
This file contains hidden or 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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is to make sure that I'm not insane.