bugfix: change the option to set volume size #1409
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
Codecov Report
@@ Coverage Diff @@
## master #1409 +/- ##
===========================================
+ Coverage 16.23% 38.78% +22.54%
===========================================
Files 200 250 +50
Lines 13583 16627 +3044
===========================================
+ Hits 2205 6448 +4243
+ Misses 11224 9353 -1871
- Partials 154 826 +672
|
|
LGTM |
|
CI faild |
allencloud
reviewed
May 25, 2018
apis/server/volume_bridge.go
Outdated
| @@ -64,6 +64,7 @@ func (s *Server) createVolume(ctx context.Context, rw http.ResponseWriter, req * | |||
| status[k] = v | |||
| } | |||
| } | |||
| status["size"] = volume.Size() | |||
There was a problem hiding this comment.
If you add this line code, then I suggest that use status := map[string]interface{}{} instead in Line 58.
If you do it like this, you can eliminate code
if status == nil {
status = make(map[string]interface{})
}
WDYT? @rudyfly
allencloud
reviewed
May 25, 2018
apis/server/volume_bridge.go
Outdated
| @@ -122,6 +124,7 @@ func (s *Server) listVolume(ctx context.Context, rw http.ResponseWriter, req *ht | |||
| status[k] = v | |||
| } | |||
| } | |||
| status["size"] = volume.Size() | |||
There was a problem hiding this comment.
The same as the above comment.
allencloud
reviewed
May 25, 2018
apis/server/volume_bridge.go
Outdated
| @@ -92,6 +93,7 @@ func (s *Server) getVolume(ctx context.Context, rw http.ResponseWriter, req *htt | |||
| status[k] = v | |||
| } | |||
| } | |||
| status["size"] = volume.Size() | |||
allencloud
reviewed
May 25, 2018
apis/server/volume_bridge.go
Outdated
| @@ -64,6 +64,7 @@ func (s *Server) createVolume(ctx context.Context, rw http.ResponseWriter, req * | |||
| status[k] = v | |||
| } | |||
| } | |||
| status["size"] = volume.Size() | |||
| respVolume.Status = status | |||
There was a problem hiding this comment.
I think we have discussed before. When constructing a returned instance like respVolume, try to use prepared everything and then initialize one, rather than initialize one instance and then set values for it.
Could you also change this part as well?
Before use 'size' or 'opt.size' to set volume size, now change it to 'opt.size', 'size' will not effective. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
allencloud
reviewed
May 27, 2018
| @@ -47,25 +47,23 @@ func (s *Server) createVolume(ctx context.Context, rw http.ResponseWriter, req * | |||
| return err | |||
| } | |||
|
|
|||
| status := map[string]interface{}{} | |||
| for k, v := range volume.Options() { | |||
There was a problem hiding this comment.
Actually there is another corner case that size exists in both volume.Options() and volume.Size().
Then what is rule to deal with this case?
Just curious, I will merge this first.
|
LGTM |
pouchrobot
added
the
LGTM
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.
Ⅰ. Describe what this PR did
Before use 'size' or 'opt.size' to set volume size, now change it to
'opt.size', 'size' will not effective.
Ⅱ. Does this pull request fix one issue?
fixes #1399
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
use this way to create volume
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com