Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4041 Fixing tests on CriticalIOException

This commit is contained in:
Clebert Suconic 2022-10-13 14:12:52 -04:00
parent 3b981b3920
commit 5a1dfdeb10
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFileFactory.java
View File

@ -58,7 +58,7 @@ public abstract class AbstractSequentialFileFactory implements SequentialFileFac
protected volatile int alignment = -1;
protected final IOCriticalErrorListener critialErrorListener;
protected IOCriticalErrorListener critialErrorListener;
protected final CriticalAnalyzer criticalAnalyzer;
@ -97,6 +97,16 @@ public abstract class AbstractSequentialFileFactory implements SequentialFileFac
this.maxIO = maxIO;
}
@Override
public IOCriticalErrorListener getCriticalErrorListener() {
return critialErrorListener;
}
@Override
public void setCriticalErrorListener(IOCriticalErrorListener listener) {
this.critialErrorListener = listener;
}
@Override
public CriticalAnalyzer getCriticalAnalyzer() {
return criticalAnalyzer;

7
artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java
View File

@ -27,6 +27,13 @@ import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
*/
public interface SequentialFileFactory {
default IOCriticalErrorListener getCriticalErrorListener() {
return null;
}
default void setCriticalErrorListener(IOCriticalErrorListener listener) {
}
default CriticalAnalyzer getCriticalAnalyzer() {
return null;
}

16
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
View File

@ -280,9 +280,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
processBackup();
} catch (Exception e) {
logger.warn(e.getMessage(), e);
if (criticalErrorListener != null) {
criticalErrorListener.onIOException(e, e.getMessage(), null);
}
fileFactory.onIOError(e, e.getMessage());
}
return this;
@ -296,8 +294,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// Compacting may replace this structure
private final ConcurrentLongHashMap<JournalTransaction> transactions = new ConcurrentLongHashMap<>();
private IOCriticalErrorListener criticalErrorListener;
// This will be set only while the JournalCompactor is being executed
private volatile JournalCompactor compactor;
@ -447,7 +443,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
super(fileFactory.isSupportsCallbacks(), fileSize);
this.criticalErrorListener = criticalErrorListener;
fileFactory.setCriticalErrorListener(criticalErrorListener);
this.providedIOThreadPool = ioExecutors;
@ -490,12 +486,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
@Override
public IOCriticalErrorListener getCriticalErrorListener() {
return criticalErrorListener;
return fileFactory.getCriticalErrorListener();
}
@Override
public JournalImpl setCriticalErrorListener(IOCriticalErrorListener criticalErrorListener) {
this.criticalErrorListener = criticalErrorListener;
fileFactory.setCriticalErrorListener(criticalErrorListener);
return this;
}
@ -2477,9 +2473,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
fileToCopy.getFile().renameTo(removeBackupExtension(fileToCopy.getFile().getFileName()));
} catch (Exception e) {
logger.warn(e.getMessage(), e);
if (criticalErrorListener != null) {
criticalErrorListener.onIOException(e, e.getMessage(), fileToCopy.getFile().getFileName());
}
fileFactory.onIOError(e, e.getMessage(), fileToCopy.getFile().getFileName());
}
fileToCopy.setReclaimable(true);