Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,9 @@
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;
Expand Down Expand Up @@ -555,9 +552,6 @@ public static class CompactionStats {
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}.
Expand All @@ -581,20 +575,6 @@ public Map<HostAndPort,CompactionStats> getCompactions() {
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<>();
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -328,24 +328,6 @@ public Map<String,Object> getCompactors() {
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
*
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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&nbsp;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>
Expand Down