Allow usage check to be configurable #6006
Merged
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
harshavardhana
force-pushed
the
allow-configurable
branch
from
bd03cfd
to
6769041
Compare
Codecov Report
@@ Coverage Diff @@
## master #6006 +/- ##
==========================================
- Coverage 59.65% 58.35% -1.31%
==========================================
Files 217 214 -3
Lines 30939 24958 -5981
==========================================
- Hits 18458 14565 -3893
+ Misses 10933 8809 -2124
- Partials 1548 1584 +36
Continue to review full report at Codecov.
|
harshavardhana
force-pushed
the
allow-configurable
branch
from
6769041
to
07b69fb
Compare
krisis
previously requested changes
Jun 4, 2018
cmd/ui-errors.go
Outdated
| "Invalid usage check interval value", | ||
| "Please check the passed value", | ||
| `MINIO_USAGE_CHECK_INTERVAL: Valid usage check interval duration string is a signed sequence of decimal numbers, | ||
| each with optional fraction and a unit suffix, such as "300ms", "-1.5h" or "2h45m". |
There was a problem hiding this comment.
what would "-1.5h" mean in the context of usage check interval?
cmd/common-main.go
Outdated
| @@ -153,6 +153,19 @@ func handleCommonEnvVars() { | |||
| globalCacheExpiry = expiry | |||
| } | |||
|
|
|||
| if intervalStr := os.Getenv("MINIO_USAGE_CHECK_INTERVAL"); intervalStr != "" { | |||
| interval, err := time.ParseDuration(intervalStr) | |||
There was a problem hiding this comment.
we could move parsing of a string to time.Duration and validating it into a separate function.
harshavardhana
force-pushed
the
allow-configurable
branch
from
07b69fb
to
a7f6024
Compare
harshavardhana
force-pushed
the
allow-configurable
branch
from
a7f6024
to
09a1d03
Compare
krisis
previously approved these changes
Jun 4, 2018
poornas
requested changes
Jun 4, 2018
cmd/config-versions.go
Outdated
| @@ -602,3 +602,30 @@ type serverConfigV23 struct { | |||
| // Notification queue configuration. | |||
| Notify notifier `json:"notify"` | |||
| } | |||
|
|
|||
| // serverConfigV24 is just like version '23' with addition of usage interval | |||
| // field.n | |||
cmd/ui-errors.go
Outdated
| "Please check the passed value", | ||
| `MINIO_USAGE_CHECK_INTERVAL: Valid usage check interval duration string is a signed sequence of decimal numbers, | ||
| each with optional fraction and a unit suffix, such as "2h45m". | ||
| Valid time units are "ns", "us", "ms", "s", "m", "h".`, |
There was a problem hiding this comment.
@harshavardhana, the indentation is off on the last 2 lines of the help message.
ERROR Unable to parse MINIO_USAGE_CHECK_INTERVAL value (`abc`): Invalid usage check interval
value.
> Please check the passed value.
HELP:
MINIO_USAGE_CHECK_INTERVAL: Valid usage check interval duration string is a signed sequence of
decimal numbers,
each with optional fraction and a unit suffix, such as "2h45m".
Valid time units are "ns", "us", "ms", "s", "m", "h".
| } | ||
| if d < globalMinimumUsageCheckInterval { | ||
| return d, fmt.Errorf("interval %s is not allowed, minimum required value is %s", | ||
| d, globalMinimumUsageCheckInterval) |
There was a problem hiding this comment.
this check doesn't seem to be executed.pls check
➜ minio git:(09a1d039) export MINIO_USAGE_CHECK_INTERVAL=1h45m
➜ minio git:(09a1d039) ./minio server ~/export
ERROR Unable to parse MINIO_USAGE_CHECK_INTERVAL value (`1h45m`): Invalid usage check interva
l value.
> Please check the passed value.
HELP:
MINIO_USAGE_CHECK_INTERVAL: Valid usage check interval duration string is a signed sequence of
decimal numbers,
each with optional fraction and a unit suffix, such as "2h45m".
Valid time units are "ns", "us", "ms", "s", "m", "h".
There was a problem hiding this comment.
Check is executed the message is only printed when json flag is enabled.
harshavardhana
force-pushed
the
allow-configurable
branch
from
09a1d03
to
ca1bae5
Compare
harshavardhana
force-pushed
the
allow-configurable
branch
from
ca1bae5
to
a857141
Compare
krisis
approved these changes
Jun 5, 2018
krishnasrinivas
pushed a commit
to krishnasrinivas/minio
that referenced
this pull request
Jun 5, 2018
krishnasrinivas
pushed a commit
to krishnasrinivas/minio
that referenced
this pull request
Jun 5, 2018
Mint Automation
6006-a857141/mint-fs.sh.log:6006-a857141/mint-gateway-s3.sh.log: |
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.
Description
Allow usage check to be configurable
Motivation and Context
Usage check configurable using
config.jsonHow Has This Been Tested?
Manually
Types of changes
Checklist:
mintPR # here: )