xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2790 Detect problems caused by simultaneous running of purge.

Browse source 
Former-commit-id: ae2cb792a1 [formerly ad5d6428a6] [formerly ae2cb792a1 [formerly ad5d6428a6] [formerly f012ac179d [formerly 882cf75a4b9a5773def3dc9f167d2c441883789f]]]
Former-commit-id: f012ac179d
Former-commit-id: b9e1dd70a9 [formerly 8b24d06488]
Former-commit-id: 111415e9f5
This commit is contained in:
Roger Ferrel 2014-03-27 14:41:09 -05:00
parent 93d29b05a9
commit fef551ba78
1 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
View file

@ -89,6 +89,7 @@ import com.raytheon.uf.common.util.FileUtil;
* Aug 28, 2013 2299 rferrel purgeExpiredFromArchive now returns the number of files purged.
* Dec 04, 2013 2603 rferrel Changes to improve archive purging.
* Dec 17, 2013 2603 rjpeter Fix directory purging.
* Mar 27, 2014 2790 rferrel Detect problems when several purges running at the same time.
* </pre>
*
* @author rferrel
@ -112,6 +113,9 @@ public class ArchiveConfigManager {
/** Mapping of archive configuration data keyed to the name. */
private final Map<String, ArchiveConfig> archiveMap = new HashMap<String, ArchiveConfig>();
/** Limit number of times message is sent. */
private boolean sentPurgeMessage = false;
/** Get the singleton. */
public final static ArchiveConfigManager getInstance() {
return instance;
@ -313,6 +317,7 @@ public class ArchiveConfigManager {
String archiveRootDirPath = archive.getRootDir();
File archiveRootDir = new File(archiveRootDirPath);
int purgeCount = 0;
sentPurgeMessage = false;
if (!archiveRootDir.isDirectory()) {
statusHandler.error(archiveRootDir.getAbsolutePath()
@ -427,6 +432,19 @@ public class ArchiveConfigManager {
return purgeCount;
}
/**
* Send race condition message out only one time per purge request.
*/
private void sendPurgeMessage() {
if (!sentPurgeMessage) {
sentPurgeMessage = true;
if (statusHandler.isPriorityEnabled(Priority.PROBLEM)) {
String message = "Archive purge finding missing directory. Purge may be running on more then one EDEX server";
statusHandler.handle(Priority.PROBLEM, message);
}
}
}
/**
* Purge the contents of a directory of expired data leaving a possibly
* empty directory.
@ -443,7 +461,13 @@ public class ArchiveConfigManager {
CategoryFileDateHelper helper, CategoryConfig category) {
int purgeCount = 0;
for (File file : dir.listFiles()) {
File[] dirFiles = dir.listFiles();
if (dirFiles == null) {
sendPurgeMessage();
return purgeCount;
}
for (File file : dirFiles) {
if (!file.isHidden()) {
DataSetStatus status = helper.getFileDate(file);
if (status.isInDataSet()) {
@ -510,15 +534,20 @@ public class ArchiveConfigManager {
*/
private int purgeDir(File dir, IOFileFilter fileDataFilter) {
int purgeCount = 0;
for (File file : dir.listFiles()) {
if (!file.isHidden()) {
if (file.isDirectory()) {
purgeCount += purgeDir(file, fileDataFilter);
if (file.list().length == 0) {
File[] dirFiles = dir.listFiles();
if (dirFiles == null) {
sendPurgeMessage();
} else {
for (File file : dirFiles) {
if (!file.isHidden()) {
if (file.isDirectory()) {
purgeCount += purgeDir(file, fileDataFilter);
if (file.list().length == 0) {
purgeCount += deleteFile(file);
}
} else if (fileDataFilter.accept(file)) {
purgeCount += deleteFile(file);
}
} else if (fileDataFilter.accept(file)) {
purgeCount += deleteFile(file);
}
}
}