http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html index b362b35..9babac2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionChore.html @@ -906,7 +906,7 @@ <span class="sourceLineNo">898</span> master.getMasterProcedureExecutor().submitProcedure(createSplitProcedure(parent, splitKey));<a name="line.898"></a> <span class="sourceLineNo">899</span><a name="line.899"></a> <span class="sourceLineNo">900</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the split<a name="line.900"></a> -<span class="sourceLineNo">901</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.901"></a> +<span class="sourceLineNo">901</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.901"></a> <span class="sourceLineNo">902</span> throw new UnsupportedOperationException(String.format(<a name="line.902"></a> <span class="sourceLineNo">903</span> "Split handled by the master: parent=%s hriA=%s hriB=%s", parent.getShortNameToLog(), hriA, hriB));<a name="line.903"></a> <span class="sourceLineNo">904</span> }<a name="line.904"></a> @@ -929,7 +929,7 @@ <span class="sourceLineNo">921</span> master.getMasterProcedureExecutor().submitProcedure(createMergeProcedure(hriA, hriB));<a name="line.921"></a> <span class="sourceLineNo">922</span><a name="line.922"></a> <span class="sourceLineNo">923</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the merge<a name="line.923"></a> -<span class="sourceLineNo">924</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.924"></a> +<span class="sourceLineNo">924</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.924"></a> <span class="sourceLineNo">925</span> throw new UnsupportedOperationException(String.format(<a name="line.925"></a> <span class="sourceLineNo">926</span> "Merge not handled yet: regionState=%s merged=%s hriA=%s hriB=%s", state, merged, hriA,<a name="line.926"></a> <span class="sourceLineNo">927</span> hriB));<a name="line.927"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html index b362b35..9babac2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.RegionInTransitionStat.html @@ -906,7 +906,7 @@ <span class="sourceLineNo">898</span> master.getMasterProcedureExecutor().submitProcedure(createSplitProcedure(parent, splitKey));<a name="line.898"></a> <span class="sourceLineNo">899</span><a name="line.899"></a> <span class="sourceLineNo">900</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the split<a name="line.900"></a> -<span class="sourceLineNo">901</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.901"></a> +<span class="sourceLineNo">901</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.901"></a> <span class="sourceLineNo">902</span> throw new UnsupportedOperationException(String.format(<a name="line.902"></a> <span class="sourceLineNo">903</span> "Split handled by the master: parent=%s hriA=%s hriB=%s", parent.getShortNameToLog(), hriA, hriB));<a name="line.903"></a> <span class="sourceLineNo">904</span> }<a name="line.904"></a> @@ -929,7 +929,7 @@ <span class="sourceLineNo">921</span> master.getMasterProcedureExecutor().submitProcedure(createMergeProcedure(hriA, hriB));<a name="line.921"></a> <span class="sourceLineNo">922</span><a name="line.922"></a> <span class="sourceLineNo">923</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the merge<a name="line.923"></a> -<span class="sourceLineNo">924</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.924"></a> +<span class="sourceLineNo">924</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.924"></a> <span class="sourceLineNo">925</span> throw new UnsupportedOperationException(String.format(<a name="line.925"></a> <span class="sourceLineNo">926</span> "Merge not handled yet: regionState=%s merged=%s hriA=%s hriB=%s", state, merged, hriA,<a name="line.926"></a> <span class="sourceLineNo">927</span> hriB));<a name="line.927"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html index b362b35..9babac2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/AssignmentManager.html @@ -906,7 +906,7 @@ <span class="sourceLineNo">898</span> master.getMasterProcedureExecutor().submitProcedure(createSplitProcedure(parent, splitKey));<a name="line.898"></a> <span class="sourceLineNo">899</span><a name="line.899"></a> <span class="sourceLineNo">900</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the split<a name="line.900"></a> -<span class="sourceLineNo">901</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.901"></a> +<span class="sourceLineNo">901</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.901"></a> <span class="sourceLineNo">902</span> throw new UnsupportedOperationException(String.format(<a name="line.902"></a> <span class="sourceLineNo">903</span> "Split handled by the master: parent=%s hriA=%s hriB=%s", parent.getShortNameToLog(), hriA, hriB));<a name="line.903"></a> <span class="sourceLineNo">904</span> }<a name="line.904"></a> @@ -929,7 +929,7 @@ <span class="sourceLineNo">921</span> master.getMasterProcedureExecutor().submitProcedure(createMergeProcedure(hriA, hriB));<a name="line.921"></a> <span class="sourceLineNo">922</span><a name="line.922"></a> <span class="sourceLineNo">923</span> // If the RS is < 2.0 throw an exception to abort the operation, we are handling the merge<a name="line.923"></a> -<span class="sourceLineNo">924</span> if (master.getServerManager().getServerVersion(serverName) < 0x0200000) {<a name="line.924"></a> +<span class="sourceLineNo">924</span> if (master.getServerManager().getVersionNumber(serverName) < 0x0200000) {<a name="line.924"></a> <span class="sourceLineNo">925</span> throw new UnsupportedOperationException(String.format(<a name="line.925"></a> <span class="sourceLineNo">926</span> "Merge not handled yet: regionState=%s merged=%s hriA=%s hriB=%s", state, merged, hriA,<a name="line.926"></a> <span class="sourceLineNo">927</span> hriB));<a name="line.927"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.AbstractRSRemoteCall.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.AbstractRSRemoteCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.AbstractRSRemoteCall.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.AbstractRSRemoteCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.AbstractRSRemoteCall.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CloseRegionRemoteCall.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CloseRegionRemoteCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CloseRegionRemoteCall.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CloseRegionRemoteCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CloseRegionRemoteCall.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CompatRemoteProcedureResolver.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CompatRemoteProcedureResolver.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CompatRemoteProcedureResolver.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CompatRemoteProcedureResolver.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.CompatRemoteProcedureResolver.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.DeadRSRemoteCall.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.DeadRSRemoteCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.DeadRSRemoteCall.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.DeadRSRemoteCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.DeadRSRemoteCall.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ExecuteProceduresRemoteCall.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ExecuteProceduresRemoteCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ExecuteProceduresRemoteCall.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ExecuteProceduresRemoteCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ExecuteProceduresRemoteCall.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.OpenRegionRemoteCall.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.OpenRegionRemoteCall.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.OpenRegionRemoteCall.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.OpenRegionRemoteCall.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.OpenRegionRemoteCall.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionCloseOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionCloseOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionCloseOperation.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionCloseOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionCloseOperation.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOpenOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOpenOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOpenOperation.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOpenOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOpenOperation.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOperation.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RegionOperation.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.RemoteProcedureResolver.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ServerOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ServerOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ServerOperation.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ServerOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.ServerOperation.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.html index 9b020f4..bf167c7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/RSProcedureDispatcher.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> @Override<a name="line.108"></a> <span class="sourceLineNo">109</span> protected void remoteDispatch(final ServerName serverName,<a name="line.109"></a> <span class="sourceLineNo">110</span> final Set<RemoteProcedure> remoteProcedures) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getServerVersion(serverName);<a name="line.111"></a> +<span class="sourceLineNo">111</span> final int rsVersion = master.getServerManager().getVersionNumber(serverName);<a name="line.111"></a> <span class="sourceLineNo">112</span> if (rsVersion >= RS_VERSION_WITH_EXEC_PROCS) {<a name="line.112"></a> <span class="sourceLineNo">113</span> LOG.trace("Using procedure batch rpc execution for serverName={} version={}", serverName,<a name="line.113"></a> <span class="sourceLineNo">114</span> rsVersion);<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/tool/PreUpgradeValidator.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/PreUpgradeValidator.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/PreUpgradeValidator.html index 7de8624..5713164 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/PreUpgradeValidator.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/PreUpgradeValidator.html @@ -73,9 +73,9 @@ <span class="sourceLineNo">065</span> private void printUsage() {<a name="line.65"></a> <span class="sourceLineNo">066</span> System.out.println("usage: hbase " + TOOL_NAME + " command ...");<a name="line.66"></a> <span class="sourceLineNo">067</span> System.out.println("Available commands:");<a name="line.67"></a> -<span class="sourceLineNo">068</span> System.out.printf(" %-12s Validate co-processors are compatible with HBase%n",<a name="line.68"></a> +<span class="sourceLineNo">068</span> System.out.printf(" %-15s Validate co-processors are compatible with HBase%n",<a name="line.68"></a> <span class="sourceLineNo">069</span> VALIDATE_CP_NAME);<a name="line.69"></a> -<span class="sourceLineNo">070</span> System.out.printf(" %-12s Validate DataBlockEncoding are compatible on the cluster%n",<a name="line.70"></a> +<span class="sourceLineNo">070</span> System.out.printf(" %-15s Validate DataBlockEncodings are compatible with HBase%n",<a name="line.70"></a> <span class="sourceLineNo">071</span> VALIDATE_DBE_NAME);<a name="line.71"></a> <span class="sourceLineNo">072</span> System.out.println("For further information, please use command -h");<a name="line.72"></a> <span class="sourceLineNo">073</span> }<a name="line.73"></a> @@ -112,16 +112,18 @@ <span class="sourceLineNo">104</span> public static void main(String[] args) {<a name="line.104"></a> <span class="sourceLineNo">105</span> int ret;<a name="line.105"></a> <span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> try {<a name="line.107"></a> -<span class="sourceLineNo">108</span> ret = ToolRunner.run(HBaseConfiguration.create(), new PreUpgradeValidator(), args);<a name="line.108"></a> -<span class="sourceLineNo">109</span> } catch (Exception e) {<a name="line.109"></a> -<span class="sourceLineNo">110</span> LOG.error("Error running command-line tool", e);<a name="line.110"></a> -<span class="sourceLineNo">111</span> ret = AbstractHBaseTool.EXIT_FAILURE;<a name="line.111"></a> -<span class="sourceLineNo">112</span> }<a name="line.112"></a> -<span class="sourceLineNo">113</span><a name="line.113"></a> -<span class="sourceLineNo">114</span> System.exit(ret);<a name="line.114"></a> -<span class="sourceLineNo">115</span> }<a name="line.115"></a> -<span class="sourceLineNo">116</span>}<a name="line.116"></a> +<span class="sourceLineNo">107</span> Configuration conf = HBaseConfiguration.create();<a name="line.107"></a> +<span class="sourceLineNo">108</span><a name="line.108"></a> +<span class="sourceLineNo">109</span> try {<a name="line.109"></a> +<span class="sourceLineNo">110</span> ret = ToolRunner.run(conf, new PreUpgradeValidator(), args);<a name="line.110"></a> +<span class="sourceLineNo">111</span> } catch (Exception e) {<a name="line.111"></a> +<span class="sourceLineNo">112</span> LOG.error("Error running command-line tool", e);<a name="line.112"></a> +<span class="sourceLineNo">113</span> ret = AbstractHBaseTool.EXIT_FAILURE;<a name="line.113"></a> +<span class="sourceLineNo">114</span> }<a name="line.114"></a> +<span class="sourceLineNo">115</span><a name="line.115"></a> +<span class="sourceLineNo">116</span> System.exit(ret);<a name="line.116"></a> +<span class="sourceLineNo">117</span> }<a name="line.117"></a> +<span class="sourceLineNo">118</span>}<a name="line.118"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dbe3a233/devapidocs/src-html/org/apache/hadoop/hbase/tool/coprocessor/CoprocessorValidator.ResolverUrlClassLoader.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/coprocessor/CoprocessorValidator.ResolverUrlClassLoader.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/coprocessor/CoprocessorValidator.ResolverUrlClassLoader.html index e026bb1..7bf358d 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/coprocessor/CoprocessorValidator.ResolverUrlClassLoader.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/coprocessor/CoprocessorValidator.ResolverUrlClassLoader.html @@ -31,228 +31,325 @@ <span class="sourceLineNo">023</span>import java.lang.reflect.Method;<a name="line.23"></a> <span class="sourceLineNo">024</span>import java.net.URL;<a name="line.24"></a> <span class="sourceLineNo">025</span>import java.net.URLClassLoader;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import java.nio.file.Path;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import java.nio.file.Paths;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import java.security.AccessController;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import java.security.PrivilegedAction;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import java.util.ArrayList;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import java.util.jar.JarEntry;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import java.util.jar.JarFile;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import java.util.stream.Collectors;<a name="line.34"></a> -<span class="sourceLineNo">035</span><a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.Coprocessor;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.tool.PreUpgradeValidator;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.tool.coprocessor.CoprocessorViolation.Severity;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a> -<span class="sourceLineNo">044</span><a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.ParseException;<a name="line.47"></a> -<span class="sourceLineNo">048</span><a name="line.48"></a> -<span class="sourceLineNo">049</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.49"></a> -<span class="sourceLineNo">050</span>public class CoprocessorValidator extends AbstractHBaseTool {<a name="line.50"></a> -<span class="sourceLineNo">051</span> private static final Logger LOG = LoggerFactory<a name="line.51"></a> -<span class="sourceLineNo">052</span> .getLogger(CoprocessorValidator.class);<a name="line.52"></a> -<span class="sourceLineNo">053</span><a name="line.53"></a> -<span class="sourceLineNo">054</span> private CoprocessorMethods branch1;<a name="line.54"></a> -<span class="sourceLineNo">055</span> private CoprocessorMethods current;<a name="line.55"></a> -<span class="sourceLineNo">056</span><a name="line.56"></a> -<span class="sourceLineNo">057</span> private boolean dieOnWarnings;<a name="line.57"></a> -<span class="sourceLineNo">058</span> private boolean scan;<a name="line.58"></a> -<span class="sourceLineNo">059</span> private List<String> args;<a name="line.59"></a> -<span class="sourceLineNo">060</span><a name="line.60"></a> -<span class="sourceLineNo">061</span> public CoprocessorValidator() {<a name="line.61"></a> -<span class="sourceLineNo">062</span> branch1 = new Branch1CoprocessorMethods();<a name="line.62"></a> -<span class="sourceLineNo">063</span> current = new CurrentCoprocessorMethods();<a name="line.63"></a> -<span class="sourceLineNo">064</span> }<a name="line.64"></a> -<span class="sourceLineNo">065</span><a name="line.65"></a> -<span class="sourceLineNo">066</span> /**<a name="line.66"></a> -<span class="sourceLineNo">067</span> * This classloader implementation calls {@link #resolveClass(Class)}<a name="line.67"></a> -<span class="sourceLineNo">068</span> * method for every loaded class. It means that some extra validation will<a name="line.68"></a> -<span class="sourceLineNo">069</span> * take place <a<a name="line.69"></a> -<span class="sourceLineNo">070</span> * href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-12.html#jls-12.3"><a name="line.70"></a> -<span class="sourceLineNo">071</span> * according to JLS</a>.<a name="line.71"></a> -<span class="sourceLineNo">072</span> */<a name="line.72"></a> -<span class="sourceLineNo">073</span> private static final class ResolverUrlClassLoader extends URLClassLoader {<a name="line.73"></a> -<span class="sourceLineNo">074</span> private ResolverUrlClassLoader(URL[] urls) {<a name="line.74"></a> -<span class="sourceLineNo">075</span> super(urls, ResolverUrlClassLoader.class.getClassLoader());<a name="line.75"></a> -<span class="sourceLineNo">076</span> }<a name="line.76"></a> +<span class="sourceLineNo">026</span>import java.nio.file.Files;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.nio.file.Path;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.nio.file.Paths;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import java.security.AccessController;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import java.security.PrivilegedAction;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import java.util.ArrayList;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import java.util.Arrays;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import java.util.Collection;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import java.util.Collections;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import java.util.List;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import java.util.Optional;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import java.util.regex.Pattern;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import java.util.stream.Collectors;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import java.util.stream.Stream;<a name="line.39"></a> +<span class="sourceLineNo">040</span><a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.fs.FileSystem;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.CoprocessorDescriptor;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.48"></a> +<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.tool.PreUpgradeValidator;<a name="line.49"></a> +<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.tool.coprocessor.CoprocessorViolation.Severity;<a name="line.50"></a> +<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.AbstractHBaseTool;<a name="line.51"></a> +<span class="sourceLineNo">052</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.52"></a> +<span class="sourceLineNo">053</span>import org.slf4j.Logger;<a name="line.53"></a> +<span class="sourceLineNo">054</span>import org.slf4j.LoggerFactory;<a name="line.54"></a> +<span class="sourceLineNo">055</span><a name="line.55"></a> +<span class="sourceLineNo">056</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.56"></a> +<span class="sourceLineNo">057</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.57"></a> +<span class="sourceLineNo">058</span><a name="line.58"></a> +<span class="sourceLineNo">059</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.59"></a> +<span class="sourceLineNo">060</span>public class CoprocessorValidator extends AbstractHBaseTool {<a name="line.60"></a> +<span class="sourceLineNo">061</span> private static final Logger LOG = LoggerFactory<a name="line.61"></a> +<span class="sourceLineNo">062</span> .getLogger(CoprocessorValidator.class);<a name="line.62"></a> +<span class="sourceLineNo">063</span><a name="line.63"></a> +<span class="sourceLineNo">064</span> private CoprocessorMethods branch1;<a name="line.64"></a> +<span class="sourceLineNo">065</span> private CoprocessorMethods current;<a name="line.65"></a> +<span class="sourceLineNo">066</span><a name="line.66"></a> +<span class="sourceLineNo">067</span> private final List<String> jars;<a name="line.67"></a> +<span class="sourceLineNo">068</span> private final List<Pattern> tablePatterns;<a name="line.68"></a> +<span class="sourceLineNo">069</span> private final List<String> classes;<a name="line.69"></a> +<span class="sourceLineNo">070</span> private boolean config;<a name="line.70"></a> +<span class="sourceLineNo">071</span><a name="line.71"></a> +<span class="sourceLineNo">072</span> private boolean dieOnWarnings;<a name="line.72"></a> +<span class="sourceLineNo">073</span><a name="line.73"></a> +<span class="sourceLineNo">074</span> public CoprocessorValidator() {<a name="line.74"></a> +<span class="sourceLineNo">075</span> branch1 = new Branch1CoprocessorMethods();<a name="line.75"></a> +<span class="sourceLineNo">076</span> current = new CurrentCoprocessorMethods();<a name="line.76"></a> <span class="sourceLineNo">077</span><a name="line.77"></a> -<span class="sourceLineNo">078</span> @Override<a name="line.78"></a> -<span class="sourceLineNo">079</span> public Class<?> loadClass(String name) throws ClassNotFoundException {<a name="line.79"></a> -<span class="sourceLineNo">080</span> return loadClass(name, true);<a name="line.80"></a> -<span class="sourceLineNo">081</span> }<a name="line.81"></a> -<span class="sourceLineNo">082</span> }<a name="line.82"></a> -<span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> private ResolverUrlClassLoader createClassLoader(URL[] urls) {<a name="line.84"></a> -<span class="sourceLineNo">085</span> return AccessController.doPrivileged(new PrivilegedAction<ResolverUrlClassLoader>() {<a name="line.85"></a> -<span class="sourceLineNo">086</span> @Override<a name="line.86"></a> -<span class="sourceLineNo">087</span> public ResolverUrlClassLoader run() {<a name="line.87"></a> -<span class="sourceLineNo">088</span> return new ResolverUrlClassLoader(urls);<a name="line.88"></a> -<span class="sourceLineNo">089</span> }<a name="line.89"></a> -<span class="sourceLineNo">090</span> });<a name="line.90"></a> -<span class="sourceLineNo">091</span> }<a name="line.91"></a> -<span class="sourceLineNo">092</span><a name="line.92"></a> -<span class="sourceLineNo">093</span> private void validate(ClassLoader classLoader, String className,<a name="line.93"></a> -<span class="sourceLineNo">094</span> List<CoprocessorViolation> violations) {<a name="line.94"></a> -<span class="sourceLineNo">095</span> LOG.debug("Validating class '{}'.", className);<a name="line.95"></a> -<span class="sourceLineNo">096</span><a name="line.96"></a> -<span class="sourceLineNo">097</span> try {<a name="line.97"></a> -<span class="sourceLineNo">098</span> Class<?> clazz = classLoader.loadClass(className);<a name="line.98"></a> -<span class="sourceLineNo">099</span><a name="line.99"></a> -<span class="sourceLineNo">100</span> for (Method method : clazz.getDeclaredMethods()) {<a name="line.100"></a> -<span class="sourceLineNo">101</span> LOG.trace("Validating method '{}'.", method);<a name="line.101"></a> -<span class="sourceLineNo">102</span><a name="line.102"></a> -<span class="sourceLineNo">103</span> if (branch1.hasMethod(method) && !current.hasMethod(method)) {<a name="line.103"></a> -<span class="sourceLineNo">104</span> CoprocessorViolation violation = new CoprocessorViolation(Severity.WARNING,<a name="line.104"></a> -<span class="sourceLineNo">105</span> "Method '" + method + "' was removed from new coprocessor API, "<a name="line.105"></a> -<span class="sourceLineNo">106</span> + "so it won't be called by HBase.");<a name="line.106"></a> -<span class="sourceLineNo">107</span> violations.add(violation);<a name="line.107"></a> -<span class="sourceLineNo">108</span> }<a name="line.108"></a> -<span class="sourceLineNo">109</span> }<a name="line.109"></a> -<span class="sourceLineNo">110</span> } catch (ClassNotFoundException e) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> CoprocessorViolation violation = new CoprocessorViolation(Severity.ERROR,<a name="line.111"></a> -<span class="sourceLineNo">112</span> "No such class '" + className + "'.", e);<a name="line.112"></a> -<span class="sourceLineNo">113</span> violations.add(violation);<a name="line.113"></a> -<span class="sourceLineNo">114</span> } catch (RuntimeException | Error e) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> CoprocessorViolation violation = new CoprocessorViolation(Severity.ERROR,<a name="line.115"></a> -<span class="sourceLineNo">116</span> "Could not validate class '" + className + "'.", e);<a name="line.116"></a> -<span class="sourceLineNo">117</span> violations.add(violation);<a name="line.117"></a> -<span class="sourceLineNo">118</span> }<a name="line.118"></a> -<span class="sourceLineNo">119</span> }<a name="line.119"></a> +<span class="sourceLineNo">078</span> jars = new ArrayList<>();<a name="line.78"></a> +<span class="sourceLineNo">079</span> tablePatterns = new ArrayList<>();<a name="line.79"></a> +<span class="sourceLineNo">080</span> classes = new ArrayList<>();<a name="line.80"></a> +<span class="sourceLineNo">081</span> }<a name="line.81"></a> +<span class="sourceLineNo">082</span><a name="line.82"></a> +<span class="sourceLineNo">083</span> /**<a name="line.83"></a> +<span class="sourceLineNo">084</span> * This classloader implementation calls {@link #resolveClass(Class)}<a name="line.84"></a> +<span class="sourceLineNo">085</span> * method for every loaded class. It means that some extra validation will<a name="line.85"></a> +<span class="sourceLineNo">086</span> * take place <a<a name="line.86"></a> +<span class="sourceLineNo">087</span> * href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-12.html#jls-12.3"><a name="line.87"></a> +<span class="sourceLineNo">088</span> * according to JLS</a>.<a name="line.88"></a> +<span class="sourceLineNo">089</span> */<a name="line.89"></a> +<span class="sourceLineNo">090</span> private static final class ResolverUrlClassLoader extends URLClassLoader {<a name="line.90"></a> +<span class="sourceLineNo">091</span> private ResolverUrlClassLoader(URL[] urls, ClassLoader parent) {<a name="line.91"></a> +<span class="sourceLineNo">092</span> super(urls, parent);<a name="line.92"></a> +<span class="sourceLineNo">093</span> }<a name="line.93"></a> +<span class="sourceLineNo">094</span><a name="line.94"></a> +<span class="sourceLineNo">095</span> @Override<a name="line.95"></a> +<span class="sourceLineNo">096</span> public Class<?> loadClass(String name) throws ClassNotFoundException {<a name="line.96"></a> +<span class="sourceLineNo">097</span> return loadClass(name, true);<a name="line.97"></a> +<span class="sourceLineNo">098</span> }<a name="line.98"></a> +<span class="sourceLineNo">099</span> }<a name="line.99"></a> +<span class="sourceLineNo">100</span><a name="line.100"></a> +<span class="sourceLineNo">101</span> private ResolverUrlClassLoader createClassLoader(URL[] urls) {<a name="line.101"></a> +<span class="sourceLineNo">102</span> return createClassLoader(urls, getClass().getClassLoader());<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> private ResolverUrlClassLoader createClassLoader(URL[] urls, ClassLoader parent) {<a name="line.105"></a> +<span class="sourceLineNo">106</span> return AccessController.doPrivileged(new PrivilegedAction<ResolverUrlClassLoader>() {<a name="line.106"></a> +<span class="sourceLineNo">107</span> @Override<a name="line.107"></a> +<span class="sourceLineNo">108</span> public ResolverUrlClassLoader run() {<a name="line.108"></a> +<span class="sourceLineNo">109</span> return new ResolverUrlClassLoader(urls, parent);<a name="line.109"></a> +<span class="sourceLineNo">110</span> }<a name="line.110"></a> +<span class="sourceLineNo">111</span> });<a name="line.111"></a> +<span class="sourceLineNo">112</span> }<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> private ResolverUrlClassLoader createClassLoader(ClassLoader parent,<a name="line.114"></a> +<span class="sourceLineNo">115</span> org.apache.hadoop.fs.Path path) throws IOException {<a name="line.115"></a> +<span class="sourceLineNo">116</span> Path tempPath = Files.createTempFile("hbase-coprocessor-", ".jar");<a name="line.116"></a> +<span class="sourceLineNo">117</span> org.apache.hadoop.fs.Path destination = new org.apache.hadoop.fs.Path(tempPath.toString());<a name="line.117"></a> +<span class="sourceLineNo">118</span><a name="line.118"></a> +<span class="sourceLineNo">119</span> LOG.debug("Copying coprocessor jar '{}' to '{}'.", path, tempPath);<a name="line.119"></a> <span class="sourceLineNo">120</span><a name="line.120"></a> -<span class="sourceLineNo">121</span> public List<CoprocessorViolation> validate(ClassLoader classLoader, List<String> classNames) {<a name="line.121"></a> -<span class="sourceLineNo">122</span> List<CoprocessorViolation> violations = new ArrayList<>();<a name="line.122"></a> +<span class="sourceLineNo">121</span> FileSystem fileSystem = FileSystem.get(getConf());<a name="line.121"></a> +<span class="sourceLineNo">122</span> fileSystem.copyToLocalFile(path, destination);<a name="line.122"></a> <span class="sourceLineNo">123</span><a name="line.123"></a> -<span class="sourceLineNo">124</span> for (String className : classNames) {<a name="line.124"></a> -<span class="sourceLineNo">125</span> validate(classLoader, className, violations);<a name="line.125"></a> -<span class="sourceLineNo">126</span> }<a name="line.126"></a> -<span class="sourceLineNo">127</span><a name="line.127"></a> -<span class="sourceLineNo">128</span> return violations;<a name="line.128"></a> -<span class="sourceLineNo">129</span> }<a name="line.129"></a> -<span class="sourceLineNo">130</span><a name="line.130"></a> -<span class="sourceLineNo">131</span> public List<CoprocessorViolation> validate(List<URL> urls, List<String> classNames)<a name="line.131"></a> -<span class="sourceLineNo">132</span> throws IOException {<a name="line.132"></a> -<span class="sourceLineNo">133</span> URL[] urlArray = new URL[urls.size()];<a name="line.133"></a> -<span class="sourceLineNo">134</span> urls.toArray(urlArray);<a name="line.134"></a> +<span class="sourceLineNo">124</span> URL url = tempPath.toUri().toURL();<a name="line.124"></a> +<span class="sourceLineNo">125</span><a name="line.125"></a> +<span class="sourceLineNo">126</span> return createClassLoader(new URL[] { url }, parent);<a name="line.126"></a> +<span class="sourceLineNo">127</span> }<a name="line.127"></a> +<span class="sourceLineNo">128</span><a name="line.128"></a> +<span class="sourceLineNo">129</span> private void validate(ClassLoader classLoader, String className,<a name="line.129"></a> +<span class="sourceLineNo">130</span> List<CoprocessorViolation> violations) {<a name="line.130"></a> +<span class="sourceLineNo">131</span> LOG.debug("Validating class '{}'.", className);<a name="line.131"></a> +<span class="sourceLineNo">132</span><a name="line.132"></a> +<span class="sourceLineNo">133</span> try {<a name="line.133"></a> +<span class="sourceLineNo">134</span> Class<?> clazz = classLoader.loadClass(className);<a name="line.134"></a> <span class="sourceLineNo">135</span><a name="line.135"></a> -<span class="sourceLineNo">136</span> try (ResolverUrlClassLoader classLoader = createClassLoader(urlArray)) {<a name="line.136"></a> -<span class="sourceLineNo">137</span> return validate(classLoader, classNames);<a name="line.137"></a> -<span class="sourceLineNo">138</span> }<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span><a name="line.140"></a> -<span class="sourceLineNo">141</span> @VisibleForTesting<a name="line.141"></a> -<span class="sourceLineNo">142</span> protected List<String> getJarClasses(Path path) throws IOException {<a name="line.142"></a> -<span class="sourceLineNo">143</span> try (JarFile jarFile = new JarFile(path.toFile())) {<a name="line.143"></a> -<span class="sourceLineNo">144</span> return jarFile.stream()<a name="line.144"></a> -<span class="sourceLineNo">145</span> .map(JarEntry::getName)<a name="line.145"></a> -<span class="sourceLineNo">146</span> .filter((name) -> name.endsWith(".class"))<a name="line.146"></a> -<span class="sourceLineNo">147</span> .map((name) -> name.substring(0, name.length() - 6).replace('/', '.'))<a name="line.147"></a> -<span class="sourceLineNo">148</span> .collect(Collectors.toList());<a name="line.148"></a> -<span class="sourceLineNo">149</span> }<a name="line.149"></a> -<span class="sourceLineNo">150</span> }<a name="line.150"></a> -<span class="sourceLineNo">151</span><a name="line.151"></a> -<span class="sourceLineNo">152</span> @VisibleForTesting<a name="line.152"></a> -<span class="sourceLineNo">153</span> protected List<String> filterObservers(ClassLoader classLoader,<a name="line.153"></a> -<span class="sourceLineNo">154</span> Iterable<String> classNames) throws ClassNotFoundException {<a name="line.154"></a> -<span class="sourceLineNo">155</span> List<String> filteredClassNames = new ArrayList<>();<a name="line.155"></a> +<span class="sourceLineNo">136</span> for (Method method : clazz.getDeclaredMethods()) {<a name="line.136"></a> +<span class="sourceLineNo">137</span> LOG.trace("Validating method '{}'.", method);<a name="line.137"></a> +<span class="sourceLineNo">138</span><a name="line.138"></a> +<span class="sourceLineNo">139</span> if (branch1.hasMethod(method) && !current.hasMethod(method)) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> CoprocessorViolation violation = new CoprocessorViolation(<a name="line.140"></a> +<span class="sourceLineNo">141</span> className, Severity.WARNING, "method '" + method +<a name="line.141"></a> +<span class="sourceLineNo">142</span> "' was removed from new coprocessor API, so it won't be called by HBase");<a name="line.142"></a> +<span class="sourceLineNo">143</span> violations.add(violation);<a name="line.143"></a> +<span class="sourceLineNo">144</span> }<a name="line.144"></a> +<span class="sourceLineNo">145</span> }<a name="line.145"></a> +<span class="sourceLineNo">146</span> } catch (ClassNotFoundException e) {<a name="line.146"></a> +<span class="sourceLineNo">147</span> CoprocessorViolation violation = new CoprocessorViolation(<a name="line.147"></a> +<span class="sourceLineNo">148</span> className, Severity.ERROR, "no such class", e);<a name="line.148"></a> +<span class="sourceLineNo">149</span> violations.add(violation);<a name="line.149"></a> +<span class="sourceLineNo">150</span> } catch (RuntimeException | Error e) {<a name="line.150"></a> +<span class="sourceLineNo">151</span> CoprocessorViolation violation = new CoprocessorViolation(<a name="line.151"></a> +<span class="sourceLineNo">152</span> className, Severity.ERROR, "could not validate class", e);<a name="line.152"></a> +<span class="sourceLineNo">153</span> violations.add(violation);<a name="line.153"></a> +<span class="sourceLineNo">154</span> }<a name="line.154"></a> +<span class="sourceLineNo">155</span> }<a name="line.155"></a> <span class="sourceLineNo">156</span><a name="line.156"></a> -<span class="sourceLineNo">157</span> for (String className : classNames) {<a name="line.157"></a> -<span class="sourceLineNo">158</span> LOG.debug("Scanning class '{}'.", className);<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> Class<?> clazz = classLoader.loadClass(className);<a name="line.160"></a> -<span class="sourceLineNo">161</span><a name="line.161"></a> -<span class="sourceLineNo">162</span> if (Coprocessor.class.isAssignableFrom(clazz)) {<a name="line.162"></a> -<span class="sourceLineNo">163</span> LOG.debug("Found coprocessor class '{}'.", className);<a name="line.163"></a> -<span class="sourceLineNo">164</span> filteredClassNames.add(className);<a name="line.164"></a> -<span class="sourceLineNo">165</span> }<a name="line.165"></a> -<span class="sourceLineNo">166</span> }<a name="line.166"></a> -<span class="sourceLineNo">167</span><a name="line.167"></a> -<span class="sourceLineNo">168</span> return filteredClassNames;<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<a name="line.169"></a> -<span class="sourceLineNo">170</span><a name="line.170"></a> -<span class="sourceLineNo">171</span> @Override<a name="line.171"></a> -<span class="sourceLineNo">172</span> protected void printUsage() {<a name="line.172"></a> -<span class="sourceLineNo">173</span> String header = "hbase " + PreUpgradeValidator.TOOL_NAME + " " +<a name="line.173"></a> -<span class="sourceLineNo">174</span> PreUpgradeValidator.VALIDATE_CP_NAME + " <jar> -scan|<classes>";<a name="line.174"></a> -<span class="sourceLineNo">175</span> printUsage(header, "Options:", "");<a name="line.175"></a> -<span class="sourceLineNo">176</span> }<a name="line.176"></a> -<span class="sourceLineNo">177</span><a name="line.177"></a> -<span class="sourceLineNo">178</span> @Override<a name="line.178"></a> -<span class="sourceLineNo">179</span> protected void addOptions() {<a name="line.179"></a> -<span class="sourceLineNo">180</span> addOptNoArg("e", "Treat warnings as errors.");<a name="line.180"></a> -<span class="sourceLineNo">181</span> addOptNoArg("scan", "Scan jar for observers.");<a name="line.181"></a> -<span class="sourceLineNo">182</span> }<a name="line.182"></a> +<span class="sourceLineNo">157</span> public void validateClasses(ClassLoader classLoader, List<String> classNames,<a name="line.157"></a> +<span class="sourceLineNo">158</span> List<CoprocessorViolation> violations) {<a name="line.158"></a> +<span class="sourceLineNo">159</span> for (String className : classNames) {<a name="line.159"></a> +<span class="sourceLineNo">160</span> validate(classLoader, className, violations);<a name="line.160"></a> +<span class="sourceLineNo">161</span> }<a name="line.161"></a> +<span class="sourceLineNo">162</span> }<a name="line.162"></a> +<span class="sourceLineNo">163</span><a name="line.163"></a> +<span class="sourceLineNo">164</span> public void validateClasses(ClassLoader classLoader, String[] classNames,<a name="line.164"></a> +<span class="sourceLineNo">165</span> List<CoprocessorViolation> violations) {<a name="line.165"></a> +<span class="sourceLineNo">166</span> validateClasses(classLoader, Arrays.asList(classNames), violations);<a name="line.166"></a> +<span class="sourceLineNo">167</span> }<a name="line.167"></a> +<span class="sourceLineNo">168</span><a name="line.168"></a> +<span class="sourceLineNo">169</span> @VisibleForTesting<a name="line.169"></a> +<span class="sourceLineNo">170</span> protected void validateTables(ClassLoader classLoader, Admin admin,<a name="line.170"></a> +<span class="sourceLineNo">171</span> Pattern pattern, List<CoprocessorViolation> violations) throws IOException {<a name="line.171"></a> +<span class="sourceLineNo">172</span> List<TableDescriptor> tableDescriptors = admin.listTableDescriptors(pattern);<a name="line.172"></a> +<span class="sourceLineNo">173</span><a name="line.173"></a> +<span class="sourceLineNo">174</span> for (TableDescriptor tableDescriptor : tableDescriptors) {<a name="line.174"></a> +<span class="sourceLineNo">175</span> LOG.debug("Validating table {}", tableDescriptor.getTableName());<a name="line.175"></a> +<span class="sourceLineNo">176</span><a name="line.176"></a> +<span class="sourceLineNo">177</span> Collection<CoprocessorDescriptor> coprocessorDescriptors =<a name="line.177"></a> +<span class="sourceLineNo">178</span> tableDescriptor.getCoprocessorDescriptors();<a name="line.178"></a> +<span class="sourceLineNo">179</span><a name="line.179"></a> +<span class="sourceLineNo">180</span> for (CoprocessorDescriptor coprocessorDescriptor : coprocessorDescriptors) {<a name="line.180"></a> +<span class="sourceLineNo">181</span> String className = coprocessorDescriptor.getClassName();<a name="line.181"></a> +<span class="sourceLineNo">182</span> Optional<String> jarPath = coprocessorDescriptor.getJarPath();<a name="line.182"></a> <span class="sourceLineNo">183</span><a name="line.183"></a> -<span class="sourceLineNo">184</span> @Override<a name="line.184"></a> -<span class="sourceLineNo">185</span> protected void processOptions(CommandLine cmd) {<a name="line.185"></a> -<span class="sourceLineNo">186</span> scan = cmd.hasOption("scan");<a name="line.186"></a> -<span class="sourceLineNo">187</span> dieOnWarnings = cmd.hasOption("e");<a name="line.187"></a> -<span class="sourceLineNo">188</span> args = cmd.getArgList();<a name="line.188"></a> -<span class="sourceLineNo">189</span> }<a name="line.189"></a> -<span class="sourceLineNo">190</span><a name="line.190"></a> -<span class="sourceLineNo">191</span> @Override<a name="line.191"></a> -<span class="sourceLineNo">192</span> protected int doWork() throws Exception {<a name="line.192"></a> -<span class="sourceLineNo">193</span> if (args.size() < 1) {<a name="line.193"></a> -<span class="sourceLineNo">194</span> System.err.println("Missing jar file.");<a name="line.194"></a> -<span class="sourceLineNo">195</span> printUsage();<a name="line.195"></a> -<span class="sourceLineNo">196</span> return EXIT_FAILURE;<a name="line.196"></a> -<span class="sourceLineNo">197</span> }<a name="line.197"></a> -<span class="sourceLineNo">198</span><a name="line.198"></a> -<span class="sourceLineNo">199</span> String jar = args.get(0);<a name="line.199"></a> +<span class="sourceLineNo">184</span> if (jarPath.isPresent()) {<a name="line.184"></a> +<span class="sourceLineNo">185</span> org.apache.hadoop.fs.Path path = new org.apache.hadoop.fs.Path(jarPath.get());<a name="line.185"></a> +<span class="sourceLineNo">186</span> try (ResolverUrlClassLoader cpClassLoader = createClassLoader(classLoader, path)) {<a name="line.186"></a> +<span class="sourceLineNo">187</span> validate(cpClassLoader, className, violations);<a name="line.187"></a> +<span class="sourceLineNo">188</span> } catch (IOException e) {<a name="line.188"></a> +<span class="sourceLineNo">189</span> CoprocessorViolation violation = new CoprocessorViolation(<a name="line.189"></a> +<span class="sourceLineNo">190</span> className, Severity.ERROR,<a name="line.190"></a> +<span class="sourceLineNo">191</span> "could not validate jar file '" + path + "'", e);<a name="line.191"></a> +<span class="sourceLineNo">192</span> violations.add(violation);<a name="line.192"></a> +<span class="sourceLineNo">193</span> }<a name="line.193"></a> +<span class="sourceLineNo">194</span> } else {<a name="line.194"></a> +<span class="sourceLineNo">195</span> validate(classLoader, className, violations);<a name="line.195"></a> +<span class="sourceLineNo">196</span> }<a name="line.196"></a> +<span class="sourceLineNo">197</span> }<a name="line.197"></a> +<span class="sourceLineNo">198</span> }<a name="line.198"></a> +<span class="sourceLineNo">199</span> }<a name="line.199"></a> <span class="sourceLineNo">200</span><a name="line.200"></a> -<span class="sourceLineNo">201</span> if (args.size() == 1 && !scan) {<a name="line.201"></a> -<span class="sourceLineNo">202</span> throw new ParseException("Missing classes or -scan option.");<a name="line.202"></a> -<span class="sourceLineNo">203</span> } else if (args.size() > 1 && scan) {<a name="line.203"></a> -<span class="sourceLineNo">204</span> throw new ParseException("Can't use classes with -scan option.");<a name="line.204"></a> -<span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span> Path jarPath = Paths.get(jar);<a name="line.207"></a> -<span class="sourceLineNo">208</span> URL[] urls = new URL[] { jarPath.toUri().toURL() };<a name="line.208"></a> -<span class="sourceLineNo">209</span><a name="line.209"></a> -<span class="sourceLineNo">210</span> List<CoprocessorViolation> violations;<a name="line.210"></a> -<span class="sourceLineNo">211</span><a name="line.211"></a> -<span class="sourceLineNo">212</span> try (ResolverUrlClassLoader classLoader = createClassLoader(urls)) {<a name="line.212"></a> -<span class="sourceLineNo">213</span> List<String> classNames;<a name="line.213"></a> -<span class="sourceLineNo">214</span><a name="line.214"></a> -<span class="sourceLineNo">215</span> if (scan) {<a name="line.215"></a> -<span class="sourceLineNo">216</span> List<String> jarClassNames = getJarClasses(jarPath);<a name="line.216"></a> -<span class="sourceLineNo">217</span> classNames = filterObservers(classLoader, jarClassNames);<a name="line.217"></a> -<span class="sourceLineNo">218</span> } else {<a name="line.218"></a> -<span class="sourceLineNo">219</span> classNames = args.subList(1, args.size());<a name="line.219"></a> -<span class="sourceLineNo">220</span> }<a name="line.220"></a> -<span class="sourceLineNo">221</span><a name="line.221"></a> -<span class="sourceLineNo">222</span> violations = validate(classLoader, classNames);<a name="line.222"></a> -<span class="sourceLineNo">223</span> }<a name="line.223"></a> -<span class="sourceLineNo">224</span><a name="line.224"></a> -<span class="sourceLineNo">225</span> boolean error = false;<a name="line.225"></a> -<span class="sourceLineNo">226</span><a name="line.226"></a> -<span class="sourceLineNo">227</span> for (CoprocessorViolation violation : violations) {<a name="line.227"></a> -<span class="sourceLineNo">228</span> switch (violation.getSeverity()) {<a name="line.228"></a> -<span class="sourceLineNo">229</span> case WARNING:<a name="line.229"></a> -<span class="sourceLineNo">230</span> System.err.println("[WARNING] " + violation.getMessage());<a name="line.230"></a> -<span class="sourceLineNo">231</span><a name="line.231"></a> -<span class="sourceLineNo">232</span> if (dieOnWarnings) {<a name="line.232"></a> -<span class="sourceLineNo">233</span> error = true;<a name="line.233"></a> -<span class="sourceLineNo">234</span> }<a name="line.234"></a> -<span class="sourceLineNo">235</span><a name="line.235"></a> -<span class="sourceLineNo">236</span> break;<a name="line.236"></a> -<span class="sourceLineNo">237</span> case ERROR:<a name="line.237"></a> -<span class="sourceLineNo">238</span> System.err.println("[ERROR] " + violation.getMessage());<a name="line.238"></a> -<span class="sourceLineNo">239</span> error = true;<a name="line.239"></a> -<span class="sourceLineNo">240</span><a name="line.240"></a> -<span class="sourceLineNo">241</span> break;<a name="line.241"></a> -<span class="sourceLineNo">242</span> }<a name="line.242"></a> -<span class="sourceLineNo">243</span> }<a name="line.243"></a> -<span class="sourceLineNo">244</span><a name="line.244"></a> -<span class="sourceLineNo">245</span> return (error) ? EXIT_FAILURE : EXIT_SUCCESS;<a name="line.245"></a> -<span class="sourceLineNo">246</span> }<a name="line.246"></a> -<span class="sourceLineNo">247</span>}<a name="line.247"></a> +<span class="sourceLineNo">201</span> private void validateTables(ClassLoader classLoader, Pattern pattern,<a name="line.201"></a> +<span class="sourceLineNo">202</span> List<CoprocessorViolation> violations) throws IOException {<a name="line.202"></a> +<span class="sourceLineNo">203</span> try (Connection connection = ConnectionFactory.createConnection(getConf());<a name="line.203"></a> +<span class="sourceLineNo">204</span> Admin admin = connection.getAdmin()) {<a name="line.204"></a> +<span class="sourceLineNo">205</span> validateTables(classLoader, admin, pattern, violations);<a name="line.205"></a> +<span class="sourceLineNo">206</span> }<a name="line.206"></a> +<span class="sourceLineNo">207</span> }<a name="line.207"></a> +<span class="sourceLineNo">208</span><a name="line.208"></a> +<span class="sourceLineNo">209</span> @Override<a name="line.209"></a> +<span class="sourceLineNo">210</span> protected void printUsage() {<a name="line.210"></a> +<span class="sourceLineNo">211</span> String header = "hbase " + PreUpgradeValidator.TOOL_NAME + " " +<a name="line.211"></a> +<span class="sourceLineNo">212</span> PreUpgradeValidator.VALIDATE_CP_NAME +<a name="line.212"></a> +<span class="sourceLineNo">213</span> " [-jar ...] [-class ... | -table ... | -config]";<a name="line.213"></a> +<span class="sourceLineNo">214</span> printUsage(header, "Options:", "");<a name="line.214"></a> +<span class="sourceLineNo">215</span> }<a name="line.215"></a> +<span class="sourceLineNo">216</span><a name="line.216"></a> +<span class="sourceLineNo">217</span> @Override<a name="line.217"></a> +<span class="sourceLineNo">218</span> protected void addOptions() {<a name="line.218"></a> +<span class="sourceLineNo">219</span> addOptNoArg("e", "Treat warnings as errors.");<a name="line.219"></a> +<span class="sourceLineNo">220</span> addOptWithArg("jar", "Jar file/directory of the coprocessor.");<a name="line.220"></a> +<span class="sourceLineNo">221</span> addOptWithArg("table", "Table coprocessor(s) to check.");<a name="line.221"></a> +<span class="sourceLineNo">222</span> addOptWithArg("class", "Coprocessor class(es) to check.");<a name="line.222"></a> +<span class="sourceLineNo">223</span> addOptNoArg("config", "Obtain coprocessor class(es) from configuration.");<a name="line.223"></a> +<span class="sourceLineNo">224</span> }<a name="line.224"></a> +<span class="sourceLineNo">225</span><a name="line.225"></a> +<span class="sourceLineNo">226</span> @Override<a name="line.226"></a> +<span class="sourceLineNo">227</span> protected void processOptions(CommandLine cmd) {<a name="line.227"></a> +<span class="sourceLineNo">228</span> String[] jars = cmd.getOptionValues("jar");<a name="line.228"></a> +<span class="sourceLineNo">229</span> if (jars != null) {<a name="line.229"></a> +<span class="sourceLineNo">230</span> Collections.addAll(this.jars, jars);<a name="line.230"></a> +<span class="sourceLineNo">231</span> }<a name="line.231"></a> +<span class="sourceLineNo">232</span><a name="line.232"></a> +<span class="sourceLineNo">233</span> String[] tables = cmd.getOptionValues("table");<a name="line.233"></a> +<span class="sourceLineNo">234</span> if (tables != null) {<a name="line.234"></a> +<span class="sourceLineNo">235</span> Arrays.stream(tables).map(Pattern::compile).forEach(tablePatterns::add);<a name="line.235"></a> +<span class="sourceLineNo">236</span> }<a name="line.236"></a> +<span class="sourceLineNo">237</span><a name="line.237"></a> +<span class="sourceLineNo">238</span> String[] classes = cmd.getOptionValues("class");<a name="line.238"></a> +<span class="sourceLineNo">239</span> if (classes != null) {<a name="line.239"></a> +<span class="sourceLineNo">240</span> Collections.addAll(this.classes, classes);<a name="line.240"></a> +<span class="sourceLineNo">241</span> }<a name="line.241"></a> +<span class="sourceLineNo">242</span><a name="line.242"></a> +<span class="sourceLineNo">243</span> config = cmd.hasOption("config");<a name="line.243"></a> +<span class="sourceLineNo">244</span> dieOnWarnings = cmd.hasOption("e");<a name="line.244"></a> +<span class="sourceLineNo">245</span> }<a name="line.245"></a> +<span class="sourceLineNo">246</span><a name="line.246"></a> +<span class="sourceLineNo">247</span> private List<URL> buildClasspath(List<String> jars) throws IOException {<a name="line.247"></a> +<span class="sourceLineNo">248</span> List<URL> urls = new ArrayList<>();<a name="line.248"></a> +<span class="sourceLineNo">249</span><a name="line.249"></a> +<span class="sourceLineNo">250</span> for (String jar : jars) {<a name="line.250"></a> +<span class="sourceLineNo">251</span> Path jarPath = Paths.get(jar);<a name="line.251"></a> +<span class="sourceLineNo">252</span> if (Files.isDirectory(jarPath)) {<a name="line.252"></a> +<span class="sourceLineNo">253</span> try (Stream<Path> stream = Files.list(jarPath)) {<a name="line.253"></a> +<span class="sourceLineNo">254</span> List<Path> files = stream<a name="line.254"></a> +<span class="sourceLineNo">255</span> .filter((path) -> Files.isRegularFile(path))<a name="line.255"></a> +<span class="sourceLineNo">256</span> .collect(Collectors.toList());<a name="line.256"></a> +<span class="sourceLineNo">257</span><a name="line.257"></a> +<span class="sourceLineNo">258</span> for (Path file : files) {<a name="line.258"></a> +<span class="sourceLineNo">259</span> URL url = file.toUri().toURL();<a name="line.259"></a> +<span class="sourceLineNo">260</span> urls.add(url);<a name="line.260"></a> +<span class="sourceLineNo">261</span> }<a name="line.261"></a> +<span class="sourceLineNo">262</span> }<a name="line.262"></a> +<span class="sourceLineNo">263</span> } else {<a name="line.263"></a> +<span class="sourceLineNo">264</span> URL url = jarPath.toUri().toURL();<a name="line.264"></a> +<span class="sourceLineNo">265</span> urls.add(url);<a name="line.265"></a> +<span class="sourceLineNo">266</span> }<a name="line.266"></a> +<span class="sourceLineNo">267</span> }<a name="line.267"></a> +<span class="sourceLineNo">268</span><a name="line.268"></a> +<span class="sourceLineNo">269</span> return urls;<a name="line.269"></a> +<span class="sourceLineNo">270</span> }<a name="line.270"></a> +<span class="sourceLineNo">271</span><a name="line.271"></a> +<span class="sourceLineNo">272</span> @Override<a name="line.272"></a> +<span class="sourceLineNo">273</span> protected int doWork() throws Exception {<a name="line.273"></a> +<span class="sourceLineNo">274</span> if (tablePatterns.isEmpty() && classes.isEmpty() && !config) {<a name="line.274"></a> +<span class="sourceLineNo">275</span> LOG.error("Please give at least one -table, -class or -config parameter.");<a name="line.275"></a> +<span class="sourceLineNo">276</span> printUsage();<a name="line.276"></a> +<span class="sourceLineNo">277</span> return EXIT_FAILURE;<a name="line.277"></a> +<span class="sourceLineNo">278</span> }<a name="line.278"></a> +<span class="sourceLineNo">279</span><a name="line.279"></a> +<span class="sourceLineNo">280</span> List<URL> urlList = buildClasspath(jars);<a name="line.280"></a> +<span class="sourceLineNo">281</span> URL[] urls = urlList.toArray(new URL[urlList.size()]);<a name="line.281"></a> +<span class="sourceLineNo">282</span><a name="line.282"></a> +<span class="sourceLineNo">283</span> LOG.debug("Classpath: {}", urlList);<a name="line.283"></a> +<span class="sourceLineNo">284</span><a name="line.284"></a> +<span class="sourceLineNo">285</span> List<CoprocessorViolation> violations = new ArrayList<>();<a name="line.285"></a> +<span class="sourceLineNo">286</span><a name="line.286"></a> +<span class="sourceLineNo">287</span> try (ResolverUrlClassLoader classLoader = createClassLoader(urls)) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> for (Pattern tablePattern : tablePatterns) {<a name="line.288"></a> +<span class="sourceLineNo">289</span> validateTables(classLoader, tablePattern, violations);<a name="line.289"></a> +<span class="sourceLineNo">290</span> }<a name="line.290"></a> +<span class="sourceLineNo">291</span><a name="line.291"></a> +<span class="sourceLineNo">292</span> validateClasses(classLoader, classes, violations);<a name="line.292"></a> +<span class="sourceLineNo">293</span><a name="line.293"></a> +<span class="sourceLineNo">294</span> if (config) {<a name="line.294"></a> +<span class="sourceLineNo">295</span> String[] masterCoprocessors =<a name="line.295"></a> +<span class="sourceLineNo">296</span> getConf().getStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY);<a name="line.296"></a> +<span class="sourceLineNo">297</span> if (masterCoprocessors != null) {<a name="line.297"></a> +<span class="sourceLineNo">298</span> validateClasses(classLoader, masterCoprocessors, violations);<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span><a name="line.300"></a> +<span class="sourceLineNo">301</span> String[] regionCoprocessors =<a name="line.301"></a> +<span class="sourceLineNo">302</span> getConf().getStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY);<a name="line.302"></a> +<span class="sourceLineNo">303</span> if (regionCoprocessors != null) {<a name="line.303"></a> +<span class="sourceLineNo">304</span> validateClasses(classLoader, regionCoprocessors, violations);<a name="line.304"></a> +<span class="sourceLineNo">305</span> }<a name="line.305"></a> +<span class="sourceLineNo">306</span> }<a name="line.306"></a> +<span class="sourceLineNo">307</span> }<a name="line.307"></a> +<span class="sourceLineNo">308</span><a name="line.308"></a> +<span class="sourceLineNo">309</span> boolean error = false;<a name="line.309"></a> +<span class="sourceLineNo">310</span><a name="line.310"></a> +<span class="sourceLineNo">311</span> for (CoprocessorViolation violation : violations) {<a name="line.311"></a> +<span class="sourceLineNo">312</span> String className = violation.getClassName();<a name="line.312"></a> +<span class="sourceLineNo">313</span> String message = violation.getMessage();<a name="line.313"></a> +<span class="sourceLineNo">314</span> Throwable throwable = violation.getThrowable();<a name="line.314"></a> +<span class="sourceLineNo">315</span><a name="line.315"></a> +<span class="sourceLineNo">316</span> switch (violation.getSeverity()) {<a name="line.316"></a> +<span class="sourceLineNo">317</span> case WARNING:<a name="line.317"></a> +<span class="sourceLineNo">318</span> if (throwable == null) {<a name="line.318"></a> +<span class="sourceLineNo">319</span> LOG.warn("Warning in class '{}': {}.", className, message);<a name="line.319"></a> +<span class="sourceLineNo">320</span> } else {<a name="line.320"></a> +<span class="sourceLineNo">321</span> LOG.warn("Warning in class '{}': {}.", className, message, throwable);<a name="line.321"></a> +<span class="sourceLineNo">322</span> }<a name="line.322"></a> +<span class="sourceLineNo">323</span><a name="line.323"></a> +<span class="sourceLineNo">324</span> if (dieOnWarnings) {<a name="line.324"></a> +<span class="sourceLineNo">325</span> error = true;<a name="line.325"></a> +<span class="sourceLineNo">326</span> }<a name="line.326"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> break;<a name="line.328"></a> +<span class="sourceLineNo">329</span> case ERROR:<a name="line.329"></a> +<span class="sourceLineNo">330</span> if (throwable == null) {<a name="line.330"></a> +<span class="sourceLineNo">331</span> LOG.error("Error in class '{}': {}.", className, message);<a name="line.331"></a> +<span class="sourceLineNo">332</span> } else {<a name="line.332"></a> +<span class="sourceLineNo">333</span> LOG.error("Error in class '{}': {}.", className, message, throwable);<a name="line.333"></a> +<span class="sourceLineNo">334</span> }<a name="line.334"></a> +<span class="sourceLineNo">335</span><a name="line.335"></a> +<span class="sourceLineNo">336</span> error = true;<a name="line.336"></a> +<span class="sourceLineNo">337</span><a name="line.337"></a> +<span class="sourceLineNo">338</span> break;<a name="line.338"></a> +<span class="sourceLineNo">339</span> }<a name="line.339"></a> +<span class="sourceLineNo">340</span> }<a name="line.340"></a> +<span class="sourceLineNo">341</span><a name="line.341"></a> +<span class="sourceLineNo">342</span> return (error) ? EXIT_FAILURE : EXIT_SUCCESS;<a name="line.342"></a> +<span class="sourceLineNo">343</span> }<a name="line.343"></a> +<span class="sourceLineNo">344</span>}<a name="line.344"></a>