This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new b76bb0e1f9 Removed Bulk Import page from the Monitor (#6383)
b76bb0e1f9 is described below
commit b76bb0e1f9913d53d83b26dda3b108098b81a8d8
Author: Dave Marion <[email protected]>
AuthorDate: Fri May 29 09:12:19 2026 -0400
Removed Bulk Import page from the Monitor (#6383)
Removed bulk import page from the Monitor
as this information is no longer tracked
in the Manager. Instead, the information
is available in the Fate tx details.
---
.../java/org/apache/accumulo/monitor/Monitor.java | 20 -----
.../monitor/rest/bulkImports/BulkImport.java | 43 -----------
.../rest/bulkImports/BulkImportInformation.java | 54 --------------
.../rest/bulkImports/BulkImportResource.java | 51 -------------
.../org/apache/accumulo/monitor/view/WebViews.java | 18 -----
.../accumulo/monitor/resources/js/bulkImport.js | 85 ----------------------
.../accumulo/monitor/resources/js/functions.js | 7 --
.../accumulo/monitor/templates/bulkImport.ftl | 42 -----------
.../apache/accumulo/monitor/templates/navbar.ftl | 1 -
9 files changed, 321 deletions(-)
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 9e1546c15d..9e53765c02 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -74,12 +74,9 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.accumulo.monitor.next.InformationFetcher;
-import org.apache.accumulo.monitor.rest.bulkImports.BulkImport;
-import org.apache.accumulo.monitor.rest.bulkImports.BulkImportInformation;
import org.apache.accumulo.server.AbstractServer;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.util.TableInfoUtil;
-import org.apache.accumulo.server.util.bulkCommand.ListBulk;
import org.apache.zookeeper.KeeperException;
import org.eclipse.jetty.ee10.servlet.ResourceServlet;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
@@ -555,9 +552,6 @@ public class Monitor extends AbstractServer implements
Connection.Listener {
private final Supplier<Map<HostAndPort,CompactionStats>> compactionsSupplier
=
Suppliers.memoizeWithExpiration(this::fetchCompactions,
expirationTimeMinutes, MINUTES);
- private final Supplier<BulkImport> bulkImportSupplier =
- Suppliers.memoizeWithExpiration(this::computeBulkImports,
expirationTimeMinutes, MINUTES);
-
/**
* @return active tablet server scans. Values are cached and refresh after
* {@link #expirationTimeMinutes}.
@@ -581,20 +575,6 @@ public class Monitor extends AbstractServer implements
Connection.Listener {
return compactionsSupplier.get();
}
- private BulkImport computeBulkImports() {
- BulkImport bulkImport = new BulkImport();
- ListBulk.list(getContext(), bulkStatus -> {
- bulkImport.addBulkImport(
- new BulkImportInformation(bulkStatus.sourceDir(),
bulkStatus.lastUpdate().toEpochMilli(),
- bulkStatus.state(), bulkStatus.tableId(), bulkStatus.fateId()));
- });
- return bulkImport;
- }
-
- public BulkImport getBulkImports() {
- return bulkImportSupplier.get();
- }
-
private Map<HostAndPort,ScanStats> fetchScans(Collection<ServerId> servers) {
ServerContext context = getContext();
Map<HostAndPort,ScanStats> scans = new HashMap<>();
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
deleted file mode 100644
index 8512e1b90f..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImport.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.bulkImports;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * BulkImport stores the bulk import and tserver bulk imports
- *
- * @since 2.0.0
- */
-public class BulkImport {
-
- // Variable names become JSON key
- public List<BulkImportInformation> bulkImport = new ArrayList<>();
-
- /**
- * Adds a new bulk import to the array
- *
- * @param bulkImport new bulk import to add
- */
- public void addBulkImport(BulkImportInformation bulkImport) {
- this.bulkImport.add(bulkImport);
- }
-
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
deleted file mode 100644
index cd84b0b34b..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportInformation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.bulkImports;
-
-import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.fate.FateId;
-import org.apache.accumulo.server.util.bulkCommand.ListBulk;
-
-/**
- * Stores bulk import in a JSON object
- *
- * @since 2.0.0
- */
-public class BulkImportInformation {
-
- // Variable names become JSON key
- public final String filename;
- public final long age;
- public final ListBulk.BulkState state;
- public final String tableId;
- public final String fateId;
-
- /**
- * Creates new bulk import object
- *
- * @param filename name of the bulk import file
- * @param age age of the bulk import
- * @param state state of the bulk import
- */
- public BulkImportInformation(String filename, long age, ListBulk.BulkState
state, TableId tableId,
- FateId fateId) {
- this.filename = filename;
- this.age = age;
- this.state = state;
- this.tableId = tableId.canonical();
- this.fateId = fateId.canonical();
- }
-}
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
deleted file mode 100644
index 2a15b1ec75..0000000000
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/bulkImports/BulkImportResource.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.monitor.rest.bulkImports;
-
-import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-
-import org.apache.accumulo.monitor.Monitor;
-
-/**
- * The BulkImportResource is responsible for obtaining the information of the
bulk import, and
- * tablet server bulk import from the Monitor and creating the JSON objects
with each
- *
- * @since 2.0.0
- */
-@Path("/bulkImports")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class BulkImportResource {
-
- @Inject
- private Monitor monitor;
-
- /**
- * Generates bulk import and tserver bulk imports with the information from
the Monitor
- *
- * @return JSON object with BulkImport information
- */
- @GET
- public BulkImport getTables() {
- return monitor.getBulkImports();
- }
-}
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 6a6caf9512..55e1e90efa 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
@@ -328,24 +328,6 @@ public class WebViews {
return model;
}
- /**
- * Returns the bulk import template
- *
- * @return Bulk Import model
- */
- @GET
- @Path("bulkImports")
- @Template(name = "/default.ftl")
- public Map<String,Object> getBulkImports() {
-
- Map<String,Object> model = getModel();
- model.put("title", "Bulk Imports");
- model.put("template", "bulkImport.ftl");
- model.put("js", "bulkImport.js");
-
- return model;
- }
-
/**
* Returns the Fate template
*
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
deleted file mode 100644
index 6ff3beb4ae..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-"use strict";
-
-var bulkListTable;
-
-/**
- * Fetches new data and updates DataTables with it
- */
-function refreshBulkImport() {
- ajaxReloadTable(bulkListTable);
-}
-
-/**
- * Used to redraw the page
- */
-function refresh() {
- refreshBulkImport();
-}
-
-/**
- * Initializes the bulk import DataTables
- */
-$(function () {
-
- const url = contextPath + 'rest/bulkImports';
- console.debug('REST url used to fetch data for the DataTables in
bulkImport.js: ' + url);
-
- // Generates the manager bulk import status table
- bulkListTable = $('#bulkListTable').DataTable({
- "ajax": {
- "url": url,
- "dataSrc": "bulkImport"
- },
- "stateSave": true,
- "autoWidth": false,
- "columns": [{
- "data": "tableId",
- "width": "5%"
- },
- {
- "data": "fateId",
- "width": "25%"
- },
- {
- "data": "filename",
- "width": "35%"
- },
- {
- "data": "age",
- "width": "25%",
- "render": function (data, type) {
- var age = Number(data);
- if (type === 'display') {
- return age > 0 ? new Date(age) : '—';
- }
- return age > 0 ? age : 0;
- }
- },
- {
- "data": "state",
- "width": "10%"
- }
- ]
- });
-
- refreshBulkImport();
-
-});
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
index dafc9c68c1..d28a46c75a 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js
@@ -493,13 +493,6 @@ function getScans() {
return getJSONForTable(REST_V2_PREFIX + '/scans', SCANS);
}
-/**
- * REST GET call for the bulk imports, stores it on a sessionStorage variable
- */
-function getBulkImports() {
- return getJSONForTable(contextPath + 'rest/bulkImports', 'bulkImports');
-}
-
/**
* REST GET call for the server stats, stores it on a sessionStorage variable
*/
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
deleted file mode 100644
index 8ae6cf9b5e..0000000000
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/bulkImport.ftl
+++ /dev/null
@@ -1,42 +0,0 @@
-<#--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
- <div class="row">
- <div class="col-xs-12">
- <h3>${title}</h3>
- </div>
- </div>
- <div class="row">
- <div class="col-xs-12">
- <table id="bulkListTable" class="table caption-top table-bordered
table-striped table-condensed">
- <caption><span class="table-caption">Bulk Imports</span><br
/></caption>
- <thead>
- <tr>
- <th>Table ID </th>
- <th>Fate ID </th>
- <th>Directory </th>
- <th title="The age of the import.">Age </th>
- <th title="The current state of the bulk
import">State </th>
- </tr>
- </thead>
- <tbody></tbody>
- </table>
- </div>
- </div>
diff --git
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 9de8837ffd..c0a7d0a00f 100644
---
a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -54,7 +54,6 @@
Activity
</a>
<ul class="dropdown-menu col-xs-12"
aria-labelledby="navbarDropdown">
- <li><a class="link-body-emphasis dropdown-item"
href="bulkImports">Bulk Imports</a></li>
<li><a class="link-body-emphasis dropdown-item"
href="coordinator">Compaction Overview</a></li>
<li><a class="link-body-emphasis dropdown-item"
href="ec">Compaction Details</a></li>
<li><a class="link-body-emphasis dropdown-item"
href="fate">Fate Tx Details</a></li>
