accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch master updated: Drop Exceptions not thrown in Monitor
Date Thu, 18 Jan 2018 18:40:26 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new f95d3fd  Drop Exceptions not thrown in Monitor
f95d3fd is described below

commit f95d3fda92d466be4b7b18087c75391307b25388
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Thu Jan 18 13:24:35 2018 -0500

    Drop Exceptions not thrown in Monitor
---
 .../accumulo/monitor/rest/tservers/TabletServerResource.java      | 2 +-
 .../src/main/java/org/apache/accumulo/monitor/view/WebViews.java  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
index 46eb315..b45e378 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java
@@ -105,7 +105,7 @@ public class TabletServerResource {
    */
   @POST
   @Consumes(MediaType.TEXT_PLAIN)
-  public void clearDeadServer(@QueryParam("server") @NotNull @Pattern(regexp = SERVER_REGEX)
String server) throws Exception {
+  public void clearDeadServer(@QueryParam("server") @NotNull @Pattern(regexp = SERVER_REGEX)
String server) {
     DeadServerList obit = new DeadServerList(ZooUtil.getRoot(Monitor.getContext().getInstance())
+ Constants.ZDEADTSERVERS);
     obit.delete(server);
   }
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
index c0d1260..1c6ecb6 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/view/WebViews.java
@@ -25,7 +25,6 @@ import static org.apache.commons.lang.StringUtils.isEmpty;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -265,7 +264,7 @@ public class WebViews {
   @GET
   @Path("tables")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTables() throws TableNotFoundException {
+  public Map<String,Object> getTables() {
 
     Map<String,Object> model = getModel();
     model.put("title", "Table Status"); // Need this for the browser tab title
@@ -285,8 +284,7 @@ public class WebViews {
   @GET
   @Path("tables/{tableID}")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTables(@PathParam("tableID") @NotNull @Pattern(regexp
= ALPHA_NUM_REGEX_TABLE_ID) String tableID) throws TableNotFoundException,
-      UnsupportedEncodingException {
+  public Map<String,Object> getTables(@PathParam("tableID") @NotNull @Pattern(regexp
= ALPHA_NUM_REGEX_TABLE_ID) String tableID) throws TableNotFoundException {
 
     String tableName = Tables.getTableName(Monitor.getContext().getInstance(), Table.ID.of(tableID));
 
@@ -357,7 +355,7 @@ public class WebViews {
   @GET
   @Path("trace/show")
   @Template(name = "/default.ftl")
-  public Map<String,Object> getTraceShow(@QueryParam("id") @NotNull @Pattern(regexp
= ALPHA_NUM_REGEX) String id) throws Exception {
+  public Map<String,Object> getTraceShow(@QueryParam("id") @NotNull @Pattern(regexp
= ALPHA_NUM_REGEX) String id) {
 
     Map<String,Object> model = getModel();
     model.put("title", "Trace ID " + id);

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

Mime
View raw message