Commit 3fcbc8fe authored by Michael Ritter's avatar Michael Ritter
Browse files

Merge branch 'release-1.14.1'

parents 86061733 1f575d74
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ace</artifactId>
<groupId>edu.umiacs.ace</groupId>
<version>1.14-RELEASE</version>
<version>1.14.1-RELEASE</version>
</parent>
<artifactId>ace-am</artifactId>
<name>ace-am</name>
......@@ -55,35 +57,29 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
<version>6.0.32</version>
<artifactId>tomcat-catalina</artifactId>
<version>7.0.94</version>
<scope>provided</scope>
</dependency>
<!-- for persistence -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>2.6.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>2.6.3</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.1</version>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<!-- for json -->
<!--
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.1</version>
</dependency>
-->
<dependency>
<groupId>net.java.dev.rome</groupId>
......@@ -93,9 +89,8 @@
<!-- for Jstl / webapp stuff-->
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
......@@ -104,14 +99,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -124,31 +118,26 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>25.0-jre</version>
</dependency>
<dependency>
......@@ -200,12 +189,14 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>2.24</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.24</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
......
......@@ -593,9 +593,12 @@ public final class AuditThread extends Thread implements CancelCallback {
LOG.trace("Generated checksum: " + currentFileHash + " expected checksum: " + storedDigest);
LogEvent event;
// If we have a registered file, set the digested value
// If we have a registered file:
// set the stored digest to be the generated hash
// set the file digest of the current monitored_item to the generated hash
if (null == storedDigest) {
LOG.trace("Setting digest for registered file " + item.getPath());
storedDigest = currentFileHash;
item.setFileDigest(currentFileHash);
item.setLastSeen(new Date());
}
......
......@@ -37,6 +37,8 @@ import edu.umiacs.ace.util.EntityManagerServlet;
import edu.umiacs.ace.util.PersistUtil;
import edu.umiacs.util.Strings;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import org.eclipse.persistence.exceptions.DatabaseException;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
......@@ -50,9 +52,11 @@ import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.concurrent.ForkJoinPool;
/**
* add,modify,remove the settings of a collection
*
* @author toaster
*/
public class ManageCollectionServlet extends EntityManagerServlet {
......@@ -77,7 +81,6 @@ public class ManageCollectionServlet extends EntityManagerServlet {
// private static final String PARAM_PEER_COLLECTION_PREFIX = "peer_col_id";
/**
*
* @param request
* @param response
* @param em
......@@ -86,7 +89,7 @@ public class ManageCollectionServlet extends EntityManagerServlet {
*/
@Override
protected void processRequest(HttpServletRequest request,
HttpServletResponse response, EntityManager em)
HttpServletResponse response, EntityManager em)
throws ServletException, IOException {
EntityTransaction trans;
......@@ -97,7 +100,7 @@ public class ManageCollectionServlet extends EntityManagerServlet {
/*
* Modification, view, or removal of an existing collection
* Modification, view, or removal of an existing collection
* if we have an int, and its > 0, and it is the key for a resource
*/
if ((collection = getCollection(request, em)) != null) {
......@@ -105,23 +108,20 @@ public class ManageCollectionServlet extends EntityManagerServlet {
if (collection.getStorage() != null) {
storage = StorageDriverFactory.createStorageAccess(collection, em);
}
/*
* Tst to see if we're removing a collection
*/
if (!Strings.isEmpty(request.getParameter(PARAM_REMOVE))
&& request.getParameter(PARAM_REMOVE).toLowerCase().equals("yes")) {
LOG.debug("removing collection " + collection.getName());
removeCollection(em, collection, storage);
ForkJoinPool.commonPool().submit(new RemoveThread(collection, storage));
response.sendRedirect("Status?collectionid=-1");
return;
} /*
* otherwise, are we updating?
*/
else if (checkParameters(request)
*/ else if (checkParameters(request)
&& ((paramCheckResponse = checkStorage(storage, request, collection)) == null)) {
LOG.debug("updating collection: " + collection.getName());
trans = em.getTransaction();
......@@ -135,17 +135,15 @@ public class ManageCollectionServlet extends EntityManagerServlet {
} /*
* ok, we're just opening an existing collection for modification
* - this should display the storage page since storage will be set
*/
else {
*/ else {
LOG.debug("loading existing collection: " + collection.getName());
dispatcher = request.getRequestDispatcher("collectionmodify.jsp");
}
} /*
* its either a new submission, or requesting a blank page.
* We shouldn't set storage information here yet, just create the
* We shouldn't set storage information here yet, just create the
* new collection and create a blank storage
*/
else {
*/ else {
collection = new Collection();
collection.setState(CollectionState.NEVER);
populateCollection(request, collection);
......@@ -154,8 +152,7 @@ public class ManageCollectionServlet extends EntityManagerServlet {
if (checkParameters(request) && hasDigest(request)) {
LOG.debug("creating collection, empty driver: " + collection.getName());
PersistUtil.persist(collection);
storage = StorageDriverFactory.createStorageAccess(collection,
em);
storage = StorageDriverFactory.createStorageAccess(collection, em);
CollectionCountContext.incrementTotalCollections();
}
......@@ -182,37 +179,6 @@ public class ManageCollectionServlet extends EntityManagerServlet {
return result;
}
private void removeCollection(EntityManager em, Collection collection, StorageDriver storage) {
EntityTransaction trans;
Query q;
trans = em.getTransaction();
trans.begin();
q = em.createNamedQuery("LogEvent.deleteByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
q = em.createNamedQuery("Token.deleteByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
q = em.createNamedQuery("MonitoredItem.deleteByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
q = em.createNamedQuery("FilterEntry.dropByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
q = em.createNamedQuery("ReportSummary.deleteByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
q = em.createNamedQuery("PeerCollection.deleteByCollection");
q.setParameter("coll", collection);
q.executeUpdate();
if (storage != null) {
storage.remove(em);
}
em.remove(collection);
CollectionCountContext.decrementTotalCollections(collection);
trans.commit();
}
private boolean hasDigest(HttpServletRequest req) {
String digest = req.getParameter(PARAM_DIGEST);
if (!Strings.isEmpty(digest)) {
......@@ -246,29 +212,23 @@ public class ManageCollectionServlet extends EntityManagerServlet {
}
if (col.getSettings() == null)
col.setSettings(new HashMap<String, String>());
col.setSettings(new HashMap<>());
if (!Strings.isEmpty(req.getParameter(PARAM_EMAILLIST))) {
// col.setEmailList(req.getParameter(PARAM_EMAILLIST));
col.getSettings().put(ConfigConstants.ATTR_EMAIL_RECIPIENTS, req.getParameter(PARAM_EMAILLIST));
}
//
if (Strings.isValidInt(req.getParameter(PARAM_CHECKPERIOD))) {
col.getSettings().put(ConfigConstants.ATTR_AUDIT_PERIOD, req.getParameter(PARAM_CHECKPERIOD));
// col.setCheckPeriod(Integer.parseInt(req.getParameter(PARAM_CHECKPERIOD)));
}
//
if (req.getParameter(PARAM_PROXY_DATA) != null) {
col.getSettings().put(ConfigConstants.ATTR_PROXY_DATA, req.getParameter(PARAM_PROXY_DATA));
// col.setProxyData("true".equals(req.getParameter(PARAM_PROXY_DATA).toLowerCase()));
}
//
if (req.getParameter(PARAM_AUDIT_TOKENS) != null) {
col.getSettings().put(ConfigConstants.ATTR_AUDIT_TOKENS, req.getParameter(PARAM_AUDIT_TOKENS));
// col.setAuditTokens("true".equals(req.getParameter(PARAM_AUDIT_TOKENS).toLowerCase()));
}
}
public boolean checkParameters(HttpServletRequest req) {
......@@ -276,4 +236,93 @@ public class ManageCollectionServlet extends EntityManagerServlet {
&& !Strings.isEmpty(req.getParameter(PARAM_DIR))
&& StorageDriverFactory.listResources().contains(req.getParameter(PARAM_DRIVER)));
}
private class RemoveThread implements Runnable {
private static final String COLL_ID = "collection_id";
private static final String PARENT_ID = "parent_id";
private static final String PARENT_COLL_ID = "parentcollection_id";
private static final String LOG_EVENT = "logevent";
private static final String LOG_EVENT_ID = COLL_ID;
private static final String ACE_TOKEN = "acetoken";
private static final String ACE_TOKEN_ID = PARENT_COLL_ID;
private static final String MONITORED_ITEM = "monitored_item";
private static final String MONITORED_ITEM_ID = PARENT_COLL_ID;
private static final String FILTER_ENTRY = "filter_entry";
private static final String FILTER_ENTRY_ID = COLL_ID;
private static final String REPORT_SUMMARY = "report_summary";
private static final String REPORT_SUMMARY_ID = COLL_ID;
private static final String PEER_COLLECTION = "peer_collection";
private static final String PEER_COLLECTION_ID = PARENT_ID;
private Boolean abort = false;
private Collection collection;
private StorageDriver storage;
private RemoveThread(Collection collection, StorageDriver storage) {
this.collection = collection;
this.storage = storage;
}
@Override
public void run() {
// this is on a separate thread so re-acquire the entity manager
NDC.push("[Remove " + collection.getName() + "] ");
EntityManager em = PersistUtil.getEntityManager();
// batching to reduce contention on tables when deleting many rows
// todo: native queries aren't the best for this, but deleting with jpql is... weird
// could possibly try to use a CriteriaBuilder and issue a subquery
LOG.info("Starting remove");
batchRm(em, collection, LOG_EVENT, LOG_EVENT_ID);
batchRm(em, collection, ACE_TOKEN, ACE_TOKEN_ID);
batchRm(em, collection, MONITORED_ITEM, MONITORED_ITEM_ID);
batchRm(em, collection, FILTER_ENTRY, FILTER_ENTRY_ID);
batchRm(em, collection, REPORT_SUMMARY, REPORT_SUMMARY_ID);
batchRm(em, collection, PEER_COLLECTION, PEER_COLLECTION_ID);
if (!abort) {
// The collection and storage driver are detached at this point so they need to be
// re-acquired
collection = em.find(Collection.class, collection.getId());
storage = StorageDriverFactory.createStorageAccess(collection, em);
if (storage != null) {
storage.remove(em);
}
LOG.info("Finishing remove");
EntityTransaction transaction = em.getTransaction();
transaction.begin();
em.remove(collection);
transaction.commit();
CollectionCountContext.decrementTotalCollections(collection);
}
NDC.pop();
NDC.clear();
}
private void batchRm(EntityManager em, Collection coll, String table, String row) {
final String queryString = "DELETE FROM %s WHERE %s = %s ORDER BY id LIMIT 1000";
boolean run = true;
LOG.debug("Removing entries for " + table);
Query q = em.createNativeQuery(String.format(queryString, table, row, coll.getId()));
while (run && !abort) {
EntityTransaction trans = em.getTransaction();
trans.begin();
try {
int affected = q.executeUpdate();
trans.commit();
run = (affected != 0);
// LOG.info("Removed " + affected + " rows setting run to " + run);
} catch (DatabaseException e) {
LOG.warn("Caught exception when removing collection", e);
trans.rollback();
run = false;
abort = true;
}
}
}
}
}
......@@ -35,6 +35,12 @@ import edu.umiacs.ace.monitor.audit.AuditConfigurationContext;
import edu.umiacs.ace.monitor.audit.AuditConfigurationContext.PauseBean;
import edu.umiacs.ace.util.PersistUtil;
import edu.umiacs.sql.SQL;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.sql.DataSource;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.sql.Blob;
......@@ -43,11 +49,6 @@ import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import javax.sql.DataSource;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import org.apache.log4j.Logger;
import org.apache.log4j.NDC;
/**
* Token migration listner to migrate tokens from the older pre-1.6 version to the current 1.6+
......@@ -225,7 +226,7 @@ public class TokenMigrationContextListener implements ServletContextListener {
+ writeStmt.executeBatch().length);
writeConn.commit();
LOG.info("Entried processed: " + i);
LOG.info("Entries processed: " + i);
} catch ( SQLException e ) {
writeConn.rollback();
LOG.error("SQL Exception while moving tokens");
......
......@@ -139,7 +139,7 @@ public class IngestStore extends EntityManagerServlet {
IngestThreadPool tPool = IngestThreadPool.getInstance();
tPool.submitTokens(batchTokens, coll);
response.sendRedirect("/TokenImportStatus?active=" + coll.getId());
response.sendRedirect("TokenImportStatus?active=" + coll.getId());
}
}
......@@ -33,7 +33,7 @@ public class IngestSupervisor implements Runnable {
public IngestSupervisor(final Map<String, Token> tokens, final Collection coll) {
this.tokens = tokens;
this.coll = coll;
this.pool = new ForkJoinPool();
this.pool = ForkJoinPool.commonPool();
this.states = new ConcurrentHashMap<>();
// so we don't have to worry about npes
......@@ -58,7 +58,7 @@ public class IngestSupervisor implements Runnable {
dirTask.quietlyJoin();
fileTask.quietlyJoin();
pool.shutdown();
// pool.shutdown();
LOG.info("Leaving Supervisor");
}
......
......@@ -32,7 +32,6 @@ package edu.umiacs.ace.monitor.register;
import edu.umiacs.ace.monitor.core.Collection;
import edu.umiacs.ace.monitor.core.MonitoredItem;
import edu.umiacs.ace.monitor.core.MonitoredItemManager;
import edu.umiacs.ace.monitor.core.Token;
import edu.umiacs.ace.monitor.log.LogEnum;
import edu.umiacs.ace.monitor.log.LogEvent;
......@@ -45,6 +44,9 @@ import org.apache.log4j.Logger;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.TypedQuery;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
......@@ -93,7 +95,7 @@ public class IngestThread extends RecursiveAction {
return;
}
if (identifiers.size() < 7000) {
if (identifiers.size() < 2500) {
// TODO: I still want to play around with rollbacks in case of failure
em = PersistUtil.getEntityManager();
EntityTransaction trans = em.getTransaction();
......@@ -115,7 +117,6 @@ public class IngestThread extends RecursiveAction {
MonitoredItem item;
session = System.currentTimeMillis();
logManager = new LogEventManager(session, coll);
MonitoredItemManager mim = new MonitoredItemManager(em);
// Cycle through all items read in and add/update tokens
// Commit only if there are no errors in all transactions
......@@ -123,7 +124,7 @@ public class IngestThread extends RecursiveAction {
for (String identifier : identifiers) {
queued.remove(identifier);
Token token = tokens.get(identifier);
item = mim.getItemByPath(identifier, coll);
item = getItemByPath(identifier, coll);
if (item == null) {
LOG.debug("[Ingest Thread " + Thread.currentThread().getId()
+ "] Adding new item " + identifier);
......@@ -256,4 +257,28 @@ public class IngestThread extends RecursiveAction {
mi.setSize(size);
return mi;
}
/**
* From MIM but without locking
*
* @param path path to look for
* @return MonitoredItem if exist, null otherwise
*/
public MonitoredItem getItemByPath(String path, Collection c) {
MonitoredItem tmp = new MonitoredItem();
tmp.setPath(path);
TypedQuery<MonitoredItem> q =
em.createNamedQuery("MonitoredItem.getItemByPath", MonitoredItem.class);
q.setParameter("path", path);
q.setParameter("coll", c);
// Make sure we have the correct item
List<MonitoredItem> li = q.getResultList();
li.sort(Comparator.comparing(MonitoredItem::getPath));
int idx = Collections.binarySearch(li, tmp, Comparator.comparing(MonitoredItem::getPath));
return (idx >= 0 ? li.get(idx) : null);
}
}
\ No newline at end of file
......@@ -141,7 +141,9 @@ public class IngestThreadPool {
protected static void shutdownPools() {
LOG.debug("[Ingest] Shutting down thread pools.");
cache.invalidateAll();
if (cache != null) {
cache.invalidateAll();
}
}
}
......@@ -7,20 +7,29 @@ Author : toaster
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Replica Added</title>
<title>Collection Remove</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
<body>
<jsp:include page="header.jsp" />
<div class="standardBody">
<h3>Confirm Remove</h3>
All replica, file, and log information for the collection ${workingCollection.collection.name} will be removed forever. Click Remove to proceed.
<BR><a href="ManageCollection?remove=yes&collectionid=${workingCollection.collection.id}">Remove</a>&nbsp;&nbsp;&nbsp;<a href="Status">Back</a>
<p>
All replica, file, and log information for the collection
${workingCollection.collection.name} will be removed forever. This process can take
time for larger collections, which may continue to appear until the remove is
complete.
</p>
<p>Click Remove to proceed.</p>
<a href="ManageCollection?remove=yes&collectionid=${workingCollection.collection.id}">
Remove</a>&nbsp;&nbsp;&nbsp;