Fixes etcdutl snapshot restore memory alloc. issue #16055
Closed
Conversation
This file contains 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
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
serathius
reviewed
Jun 12, 2023
etcdutl/etcdutl/snapshot_command.go
Outdated
| @@ -75,6 +76,7 @@ func NewSnapshotRestoreCommand() *cobra.Command { | |||
| cmd.Flags().StringVar(&restorePeerURLs, "initial-advertise-peer-urls", defaultInitialAdvertisePeerURLs, "List of this member's peer URLs to advertise to the rest of the cluster") | |||
| cmd.Flags().StringVar(&restoreName, "name", defaultName, "Human-readable name for this member") | |||
| cmd.Flags().BoolVar(&skipHashCheck, "skip-hash-check", false, "Ignore snapshot integrity hash value (required if copied from data directory)") | |||
| cmd.Flags().Int64Var("aBackendBytes, "quota-backend-bytes", 0, "Backend quota size. 0 means use the default quota.)") | |||
There was a problem hiding this comment.
Can you add information about what is the default quota.
There was a problem hiding this comment.
I refactored all PR. I hope better then old PR. Could you please review again.
serathius
reviewed
Jun 12, 2023
etcdutl/etcdutl/snapshot_command.go
Outdated
| @@ -75,6 +76,7 @@ func NewSnapshotRestoreCommand() *cobra.Command { | |||
| cmd.Flags().StringVar(&restorePeerURLs, "initial-advertise-peer-urls", defaultInitialAdvertisePeerURLs, "List of this member's peer URLs to advertise to the rest of the cluster") | |||
| cmd.Flags().StringVar(&restoreName, "name", defaultName, "Human-readable name for this member") | |||
| cmd.Flags().BoolVar(&skipHashCheck, "skip-hash-check", false, "Ignore snapshot integrity hash value (required if copied from data directory)") | |||
| cmd.Flags().Int64Var("aBackendBytes, "quota-backend-bytes", 0, "Backend quota size. 0 means use the default quota.)") | |||
There was a problem hiding this comment.
Can you replace 0 with the default quota?
serathius
reviewed
Jun 12, 2023
server/storage/backend/backend.go
Outdated
| @@ -151,6 +151,15 @@ type BackendConfig struct { | |||
| Hooks Hooks | |||
| } | |||
|
|
|||
| type NewDefBackend struct { | |||
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
tjungblu
reviewed
Jun 14, 2023
| @@ -38,6 +38,7 @@ var ( | |||
| restorePeerURLs string | |||
| restoreName string | |||
| skipHashCheck bool | |||
| initialMmapSize = uint64(10 * 1024 * 1024 * 1024) | |||
There was a problem hiding this comment.
I copied from here
jmhbnz
reviewed
Jul 17, 2023
There was a problem hiding this comment.
I think this is looking pretty good, thanks @fatihusta.
Suggest potentially squashing commits down to 1 or 2 if you have time. Also one small nitpick on alignment.
server/config/config.go
Outdated
| @@ -124,6 +124,7 @@ type ServerConfig struct { | |||
| CompactionBatchLimit int | |||
| CompactionSleepInterval time.Duration | |||
| QuotaBackendBytes int64 | |||
| InitialMmapSize uint64 | |||
There was a problem hiding this comment.
Nit - Alignment of unit64 here looks slight off.
There was a problem hiding this comment.
Done. :) thanks for your review.
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
fuweid
approved these changes
Jul 19, 2023
4 tasks
|
As discussed in the fortnightly etcd triage meeting, I'm continuing the work by squashing the commit and rebasing main in PR #17277. |
|
superseded by #17277 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #16052
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.