-
Notifications
You must be signed in to change notification settings - Fork 153
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
[#960][part-3] feat(dashboard): Provides a start-stop script for the dashboard. #1056
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1056 +/- ##
============================================
+ Coverage 53.47% 54.41% +0.94%
Complexity 2695 2695
============================================
Files 411 391 -20
Lines 23644 21283 -2361
Branches 2006 2006
============================================
- Hits 12643 11581 -1062
+ Misses 10225 8997 -1228
+ Partials 776 705 -71 ☔ View full report in Codecov by Sentry. |
200a340
to
57c35ad
Compare
9f7a28c
to
e45add2
Compare
@jerqi @xianjingfeng @leixm Please look at it for me. |
dashboard/src/main/java/org/apache/uniffle/dashboard/web/config/DashboardConf.java
Outdated
Show resolved
Hide resolved
dashboard/src/main/java/org/apache/uniffle/dashboard/web/JettyServerFront.java
Outdated
Show resolved
Hide resolved
dashboard/src/main/java/org/apache/uniffle/dashboard/web/proxy/WebProxyServlet.java
Outdated
Show resolved
Hide resolved
return null; | ||
} | ||
StringBuilder target = new StringBuilder(); | ||
String targetUri = "http://" + hostAndPort + "/"; |
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.
May use https
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.
May use https
None of the servers support https, so that's not necessary.
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.
incubator-uniffle/common/src/main/java/org/apache/uniffle/common/web/JettyServer.java
Lines 83 to 85 in be10697
if (conf.getBoolean(RssBaseConf.JETTY_SSL_ENABLE)) { | |
addHttpsConnector(httpConfig, conf); | |
} |
4d91c6a
to
04fd4af
Compare
@@ -30,6 +30,12 @@ public class DashboardConf extends RssBaseConf { | |||
.defaultValue(19988) | |||
.withDescription("http server http port"); | |||
|
|||
public static final ConfigOption<String> COORDINATOR_JETTY_ADDRESS = | |||
ConfigOptions.key("coordinator.jetty.address") |
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.
Is it possible that we will not use jetty in the future?Or we don’t use java to implement coordinator? How about coordinator.web.address or coordinator.address?
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.
Is it possible that we will not use jetty in the future?Or we don’t use java to implement coordinator? How about coordinator.web.address or coordinator.address?
OK.
35e497d
to
a55609c
Compare
} else { | ||
targetUri = "http://" + targetAddress + "/"; | ||
} | ||
if (targetUri.endsWith("/")) { |
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.
Is this always true?
HandlerList handlers = new HandlerList(); | ||
ResourceHandler resourceHandler = addResourceHandler(); | ||
String coordinatorWebAddress = conf.getString(DashboardConf.COORDINATOR_WEB_ADDRESS); | ||
boolean sslEnable = conf.getBoolean(DashboardConf.JETTY_SSL_ENABLE, false); |
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.
Reusing JETTY_SSL_ENABLE
is weird. Could you add a new parameter? Such as coodinator.ssl.enable
. Or change the format of COORDINATOR_WEB_ADDRESS
to http://host:port/
a55609c
to
60f13d9
Compare
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.
LGTM
60f13d9
to
814bb6d
Compare
Merged. Thanks @yl09099 |
…he dashboard. (#1346) ### What changes were proposed in this pull request? Fix get_pid_file_name function for the dashboard. ### Why are the changes needed? This is the follow up pr of [#1056](#1056) ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? By running the script: start-dashboard.sh and stop-dashboard.sh.
…r the dashboard. (apache#1056) ### What changes were proposed in this pull request? Provides a start-stop script for the dashboard. ### Why are the changes needed? Fix: apache#960 ### Does this PR introduce any user-facing change? Start and close the dashboard module using shell scripts. ### How was this patch tested? UT.
… for the dashboard. (apache#1346) ### What changes were proposed in this pull request? Fix get_pid_file_name function for the dashboard. ### Why are the changes needed? This is the follow up pr of [apache#1056](apache#1056) ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? By running the script: start-dashboard.sh and stop-dashboard.sh.
What changes were proposed in this pull request?
Provides a start-stop script for the dashboard.
Why are the changes needed?
(Please clarify why the changes are needed. For instance,
Fix: #960
Does this PR introduce any user-facing change?
Start and close the dashboar module using shell scripts.
How was this patch tested?
UT.