You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2019/10/31 05:52:27 UTC
[impala] branch master updated (5dc5035 -> b8b39f1)
This is an automated email from the ASF dual-hosted git repository.
tarmstrong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git.
from 5dc5035 IMPALA-9102: Have webserver fall back to --hostname
new d08d195 IMPALA-8879: Fix wrong active tabs after bootstrap upgrade
new b8b39f1 IMPALA-8815: fix ranger startup after set-classpath.sh
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/set-classpath.sh | 5 +----
testdata/bin/run-ranger-server.sh | 7 ++++++-
www/jvm-threadz.tmpl | 2 +-
www/query_backends.tmpl | 6 ++++--
www/query_detail_tabs.tmpl | 16 ++++++++--------
www/query_finstances.tmpl | 6 ++++--
www/query_memory.tmpl | 2 +-
www/query_plan.tmpl | 2 +-
www/query_plan_text.tmpl | 2 +-
www/query_profile.tmpl | 2 +-
www/query_stmt.tmpl | 2 +-
www/query_summary.tmpl | 2 +-
www/threadz.tmpl | 2 +-
www/threadz_tabs.tmpl | 8 ++++----
14 files changed, 35 insertions(+), 29 deletions(-)
[impala] 01/02: IMPALA-8879: Fix wrong active tabs after bootstrap
upgrade
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit d08d1956cc65cee2d9d5558eac38b0562e93fcab
Author: stiga-huang <hu...@gmail.com>
AuthorDate: Wed Oct 30 09:21:44 2019 +0800
IMPALA-8879: Fix wrong active tabs after bootstrap upgrade
After upgrading Bootstrap to 4.3.1 in the previous patch, the query page
no longer highlights which tab is being used. This is due to the removal
of ".nav-tabs > li.active > a" in bootstrap.css. So li elements in
"active" class no longer has additional styles. Instead, the styles of
"active" class is moved into to "nav-link" class in Bootstrap 4. We
should add the "active" class in the "nav-link" elements instead.
Tests:
- Manually click throught all tabs to check the active state
Change-Id: I5c746bc4f49b30df54bd3c73ac6f1cf838260c65
Reviewed-on: http://gerrit.cloudera.org:8080/14582
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
www/jvm-threadz.tmpl | 2 +-
www/query_backends.tmpl | 6 ++++--
www/query_detail_tabs.tmpl | 16 ++++++++--------
www/query_finstances.tmpl | 6 ++++--
www/query_memory.tmpl | 2 +-
www/query_plan.tmpl | 2 +-
www/query_plan_text.tmpl | 2 +-
www/query_profile.tmpl | 2 +-
www/query_stmt.tmpl | 2 +-
www/query_summary.tmpl | 2 +-
www/threadz.tmpl | 2 +-
www/threadz_tabs.tmpl | 8 ++++----
12 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/www/jvm-threadz.tmpl b/www/jvm-threadz.tmpl
index 91500d9..71bde47 100644
--- a/www/jvm-threadz.tmpl
+++ b/www/jvm-threadz.tmpl
@@ -61,7 +61,7 @@ under the License.
</script>
<script>
- document.getElementById("jvm-tab").className = "active";
+ $("#jvm-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/query_backends.tmpl b/www/query_backends.tmpl
index 0ff32cd..0d8bb07 100644
--- a/www/query_backends.tmpl
+++ b/www/query_backends.tmpl
@@ -49,8 +49,6 @@ under the License.
</table>
<script>
-document.getElementById("backends-tab").className = "active";
-
var intervalId = 0;
var table = null;
var refresh = function () {
@@ -98,4 +96,8 @@ started any backends yet.
</div>
{{/backend_states}}
+<script>
+$("#backends-tab").addClass("active");
+</script>
+
{{> www/common-footer.tmpl }}
diff --git a/www/query_detail_tabs.tmpl b/www/query_detail_tabs.tmpl
index 5996806..10a211e 100644
--- a/www/query_detail_tabs.tmpl
+++ b/www/query_detail_tabs.tmpl
@@ -21,12 +21,12 @@ under the License.
{{?status}}<h4><em>Status:</em> <span id="status">{{status}}</span></h4>{{/status}}
<ul class="nav nav-tabs">
- <li class="nav-item" id="plan-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_plan?query_id={{query_id}}">Plan</a></li>
- <li class="nav-item" id="stmt-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_stmt?query_id={{query_id}}">Query</a></li>
- <li class="nav-item" id="plan-text-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_plan_text?query_id={{query_id}}">Text plan</a></li>
- <li class="nav-item" id="summary-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_summary?query_id={{query_id}}">Summary</a></li>
- <li class="nav-item" id="profile-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_profile?query_id={{query_id}}">Profile</a></li>
- <li class="nav-item" id="memory-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_memory?query_id={{query_id}}">Memory</a></li>
- <li class="nav-item" id="backends-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_backends?query_id={{query_id}}">Backends</a></li>
- <li class="nav-item" id="finstances-tab" role="presentation"><a class="nav-link" href="{{ __common__.host-url }}/query_finstances?query_id={{query_id}}">Fragment Instances</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="plan-tab" href="{{ __common__.host-url }}/query_plan?query_id={{query_id}}">Plan</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="stmt-tab" href="{{ __common__.host-url }}/query_stmt?query_id={{query_id}}">Query</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="plan-text-tab" href="{{ __common__.host-url }}/query_plan_text?query_id={{query_id}}">Text plan</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="summary-tab" href="{{ __common__.host-url }}/query_summary?query_id={{query_id}}">Summary</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="profile-tab" href="{{ __common__.host-url }}/query_profile?query_id={{query_id}}">Profile</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="memory-tab" href="{{ __common__.host-url }}/query_memory?query_id={{query_id}}">Memory</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="backends-tab" href="{{ __common__.host-url }}/query_backends?query_id={{query_id}}">Backends</a></li>
+ <li class="nav-item" role="presentation"><a class="nav-link" id="finstances-tab" href="{{ __common__.host-url }}/query_finstances?query_id={{query_id}}">Fragment Instances</a></li>
</ul>
diff --git a/www/query_finstances.tmpl b/www/query_finstances.tmpl
index 806235d..53969a1 100644
--- a/www/query_finstances.tmpl
+++ b/www/query_finstances.tmpl
@@ -46,8 +46,6 @@ under the License.
</table>
<script>
-document.getElementById("finstances-tab").className = "active";
-
var intervalId = 0;
var table = null;
var refresh = function () {
@@ -126,4 +124,8 @@ Query <strong>{{query_id}}</strong> has completed, or has not started any backen
<script>$("#query_finished_alert").css("visibility", "visible");</script>
{{/backend_instances}}
+<script>
+$("#finstances-tab").addClass("active");
+</script>
+
{{> www/common-footer.tmpl }}
diff --git a/www/query_memory.tmpl b/www/query_memory.tmpl
index de0fcfe..d31116b 100644
--- a/www/query_memory.tmpl
+++ b/www/query_memory.tmpl
@@ -24,6 +24,6 @@ under the License.
<pre>{{mem_usage}}</pre>
<script>
-document.getElementById("memory-tab").className = "active";
+$("#memory-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/query_plan.tmpl b/www/query_plan.tmpl
index 5cedc6a..c677e90 100644
--- a/www/query_plan.tmpl
+++ b/www/query_plan.tmpl
@@ -76,7 +76,7 @@ over each plan fragment in turn. Plan fragments are connected wherever a node ha
data_stream_target attribute. -->
<script>
-document.getElementById("plan-tab").className = "active";
+$("#plan-tab").addClass("active");
var g = new dagreD3.graphlib.Graph().setGraph({rankDir: "BT"});
diff --git a/www/query_plan_text.tmpl b/www/query_plan_text.tmpl
index d73ab3e..3f922f0 100644
--- a/www/query_plan_text.tmpl
+++ b/www/query_plan_text.tmpl
@@ -24,7 +24,7 @@ under the License.
<pre>{{plan}}</pre>
<script>
-document.getElementById("plan-text-tab").className = "active";
+$("#plan-text-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/query_profile.tmpl b/www/query_profile.tmpl
index 6a5a659..f4df17a 100644
--- a/www/query_profile.tmpl
+++ b/www/query_profile.tmpl
@@ -41,7 +41,7 @@ under the License.
<pre>{{profile}}</pre>
<script>
-document.getElementById("profile-tab").className = "active";
+$("#profile-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/query_stmt.tmpl b/www/query_stmt.tmpl
index 0ad6770..a5886ff 100644
--- a/www/query_stmt.tmpl
+++ b/www/query_stmt.tmpl
@@ -33,7 +33,7 @@ under the License.
{{?stmt}}<pre class="code"><code>{{stmt}}</code></pre>{{/stmt}}
<script>
-document.getElementById("stmt-tab").className = "active";
+$("#stmt-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/query_summary.tmpl b/www/query_summary.tmpl
index 8ed6e9b..adfbeff 100644
--- a/www/query_summary.tmpl
+++ b/www/query_summary.tmpl
@@ -32,7 +32,7 @@ under the License.
<pre id="summary">{{summary}}</pre>
<script>
-document.getElementById("summary-tab").className = "active";
+$("#summary-tab").addClass("active");
// Periodically refreshes the summary details
function refresh() {
diff --git a/www/threadz.tmpl b/www/threadz.tmpl
index 6686945..5f52a3d 100644
--- a/www/threadz.tmpl
+++ b/www/threadz.tmpl
@@ -41,7 +41,7 @@ under the License.
{{/jvm-threads}}
<script>
-document.getElementById("overview-tab").className = "active";
+$("#overview-tab").addClass("active");
</script>
{{> www/common-footer.tmpl }}
diff --git a/www/threadz_tabs.tmpl b/www/threadz_tabs.tmpl
index 588ad5b..69f5b13 100644
--- a/www/threadz_tabs.tmpl
+++ b/www/threadz_tabs.tmpl
@@ -20,12 +20,12 @@ under the License.
<h2>Threads</h2>
<ul class="nav nav-tabs">
- <li id="overview-tab" class="navbar-item" role="presentation">
- <a class="nav-link" href="{{ __common__.host-url }}/threadz">Overview</a>
+ <li class="navbar-item" role="presentation">
+ <a class="nav-link" id="overview-tab" href="{{ __common__.host-url }}/threadz">Overview</a>
</li>
{{?jvm-threads}}
- <li id="jvm-tab" class="navbar-item" role="presentation">
- <a class="nav-link" href="{{ __common__.host-url }}/jvm-threadz">JVM</a>
+ <li class="navbar-item" role="presentation">
+ <a class="nav-link" id="jvm-tab" href="{{ __common__.host-url }}/jvm-threadz">JVM</a>
</li>
{{/jvm-threads}}
</ul>
[impala] 02/02: IMPALA-8815: fix ranger startup after
set-classpath.sh
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit b8b39f1d275c36e624b24942916586f199ebb88d
Author: Tim Armstrong <ta...@cloudera.com>
AuthorDate: Tue Jul 30 16:23:43 2019 -0700
IMPALA-8815: fix ranger startup after set-classpath.sh
Having non-existent or incompatible jars on the classpath can cause
Ranger startup to fail. Update run-ranger-server.sh to clean the
classpath so that it works after sourcing set-classpath.sh.
Also remove a couple of legacy jars from 2013. Those jars
no longer exist in Hive.
Testing:
In my development environment.
$ . bin/set-classpath.sh
$ ./testdata/bin/run-ranger-server.sh
Change-Id: Ie7036f9a07e5c9b8d46bb7f459d0b9d1e7e9d0a7
Reviewed-on: http://gerrit.cloudera.org:8080/14152
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/set-classpath.sh | 5 +----
testdata/bin/run-ranger-server.sh | 7 ++++++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/bin/set-classpath.sh b/bin/set-classpath.sh
index 5ee9874..d5a1682 100644
--- a/bin/set-classpath.sh
+++ b/bin/set-classpath.sh
@@ -32,10 +32,7 @@ CLASSPATH=\
"$IMPALA_HOME"/fe/src/test/resources:\
"$IMPALA_HOME"/fe/target/classes:\
"$IMPALA_HOME"/fe/target/dependency:\
-"$IMPALA_HOME"/fe/target/test-classes:\
-"${HIVE_HOME}"/lib/datanucleus-api-jdo-3.2.1.jar:\
-"${HIVE_HOME}"/lib/datanucleus-core-3.2.2.jar:\
-"${HIVE_HOME}"/lib/datanucleus-rdbms-3.2.1.jar:
+"$IMPALA_HOME"/fe/target/test-classes:
FE_CP_FILE="$IMPALA_HOME/fe/target/build-classpath.txt"
diff --git a/testdata/bin/run-ranger-server.sh b/testdata/bin/run-ranger-server.sh
index 6baccb7..1290e81 100755
--- a/testdata/bin/run-ranger-server.sh
+++ b/testdata/bin/run-ranger-server.sh
@@ -26,5 +26,10 @@ if [[ ! -d "${RANGER_LOG_DIR}" ]]; then
mkdir -p "${RANGER_LOG_DIR}"
fi
+# IMPALA-8815: don't allow additional potentially incompatible jars to get onto
+# the ranger classpath. We should only need the test cluster configs on the classpath.
+unset CLASSPATH
+. $IMPALA_HOME/bin/impala-config.sh
+
JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=30130" \
- "${RANGER_HOME}"/ews/ranger-admin-services.sh restart
\ No newline at end of file
+ "${RANGER_HOME}"/ews/ranger-admin-services.sh restart