HDDS-1651. Create a http.policy config for Ozone #930
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
Change-Id: Ia284f685f6d39a512124e6055537615d325ae96b
|
💔 -1 overall
This message was automatically generated. |
bharatviswa504
requested changes
Jun 9, 2019
| @@ -64,6 +64,8 @@ | |||
| "dfs.container.ratis.ipc"; | |||
| public static final int DFS_CONTAINER_RATIS_IPC_PORT_DEFAULT = 9858; | |||
|
|
|||
| public static final String OZONE_HTTP_POLICY = "ozone.http.policy"; | |||
|
|
|||
There was a problem hiding this comment.
This newly added property should be used during HTTP server start.
That part is missing.
| @@ -426,6 +430,20 @@ public static long getUtcTime() { | |||
| return Calendar.getInstance(UTC_ZONE).getTimeInMillis(); | |||
| } | |||
|
|
|||
| public static Policy getHttpPolicy(Configuration conf) { | |||
| String policyStr = conf.get("ozone.http.policy", OzoneConfigKeys.OZONE_HTTP_POLICY); | |||
There was a problem hiding this comment.
Minor NIT: ozone.http.policy -> Use OzoneConfigKeys.OZONE_HTTP_POLICY.
There was a problem hiding this comment.
This line get() second param value should be a default value for the property.
Change-Id: I047aafc733c936fb82f926bcde489595cf51d928
| if (policy == null) { | ||
| throw new HadoopIllegalArgumentException("Unrecognized value '" + policyStr + "' for " + "dfs.http.policy"); | ||
| } else { | ||
| conf.set("dfs.http.policy", policy.name()); |
There was a problem hiding this comment.
Why do we need to set it back?
There was a problem hiding this comment.
Thank You @shwetayakkali for the contribution.
I have a few comments.
| String policyStr = conf.get("ozone.http.policy", OzoneConfigKeys.OZONE_HTTP_POLICY); | ||
| if(policyStr == null || policyStr.length() == 0) { | ||
| policyStr = conf.get("dfs.http.policy", DFSConfigKeys.DFS_HTTP_POLICY_DEFAULT); | ||
| } |
There was a problem hiding this comment.
If HTTP_ONLY is used as the default,
we can conf.get("OzoneConfigKeys.OZONE_HTTP_POLICY", DFSConfigKeys.DFS_HTTP_POLICY_DEFAULT);
Then we don't need checks of null, and we can make this logic simple.
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
One more comment, we need to change the code in OzoneManagerSnapShotProvider class, to use this newly added method. Line 89: this.httpPolicy = DFSUtil.getHttpPolicy(conf); |
Change-Id: I23b1ddc619488bb290be9136a18ec5e2aab7dd77
|
💔 -1 overall
This message was automatically generated. |
|
Hi, I feel ozone can also re-use the hdfs config. In this way, we don't miss the code changes where HTTP policy is being used, like OzoneManagerSnapShotProvider which uses still DFSUtils.getHttpPolicy. And also we use to create HttpServer2.Builder builder with below code. That again uses dfs.http.policy. So, this is the reason we need to set ozone.http.policy to dfs.http.policy to make it work. So, I feel to avoid all these, we can use dfs.http.policy as before. Let me know your thoughts on this. |
| @@ -31,6 +31,7 @@ | |||
| import java.util.Optional; | |||
| import java.util.TimeZone; | |||
|
|
|||
| import org.apache.hadoop.HadoopIllegalArgumentException; | |||
There was a problem hiding this comment.
Minor: Unused import.
There was a problem hiding this comment.
+1 for using dfs.http..policy to reduce redundant config knobs.
There was a problem hiding this comment.
Thank You @eyanghwx for review.
I also feel the same. Can we close this as won't Fix?
There was a problem hiding this comment.
Thank You @eyanghwx for the confirmation.
I will close this as Won't fix.
|
Thank You @shwetayakkali for the contribution. |
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.
Change-Id: Ia284f685f6d39a512124e6055537615d325ae96b