Commit b23f5b5
authored
* HBASE-29223 Migrate Master Status Jamon page back to JSP (#6875)
The JSP code is equivalent to the Jamon code, just changed the syntax back to JSP.
Request attributes are used to transfer data between JSP pages.
Tried to preserve the code as much as possible but did some changes:
Sub-templates were usually extracted to separate JSP file (and included with `<jsp:include`), in some case it was extracted as Java method.
Extracted some sections from master page to separate JSP pages:
- Software Attributes
- Warnings
Extracted the long JavaScript from the master page which executes on page load to separate JS file.
Extracted some frequently used static methods to a new util class: `MasterStatusUtil`. Also added unit tests for the static methods in `MasterStatusUtil`.
Changed the Master Status page back to `/master.jsp` again. Now made sure that `/master-status` redirects to `/master.jsp`.
Signed-off-by: Istvan Toth <[email protected]>
(cherry picked from commit be40011)
* [ADDENDUM] HBASE-29223 Fix TestMasterStatusUtil (#7416)
TestMasterStatusUtil.testGetFragmentationInfoTurnedOn failed in master nightly build
Signed-off-by: Nihal Jain <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 8ef271f)
1 parent f8d9cd3 commit b23f5b5
File tree
46 files changed
+3185
-2298
lines changed- hbase-server/src
- main
- jamon/org/apache/hadoop/hbase/tmpl
- master
- regionserver
- java/org/apache/hadoop/hbase/master/http
- resources/hbase-webapps
- master
- static/js
- test/java/org/apache/hadoop/hbase
- master/http
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
46 files changed
+3185
-2298
lines changedLines changed: 0 additions & 128 deletions
This file was deleted.
Lines changed: 0 additions & 70 deletions
This file was deleted.
0 commit comments