You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/05/12 13:52:12 UTC
[activemq-artemis] branch main updated (a30b3a8 -> 67d4727)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from a30b3a8 ARTEMIS-3293 System test on Paging and DLQ processing
new 4727be6 NO-JIRA fixing logging.properties
new 67d4727 NO-JIRA removing runDirectJournalBlast
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jdbc/store/journal/JDBCJournalImpl.java | 4 --
.../activemq/artemis/core/journal/Journal.java | 2 -
.../core/journal/impl/FileWrapperJournal.java | 5 --
.../artemis/core/journal/impl/JournalImpl.java | 59 ----------------------
.../core/replication/ReplicatedJournal.java | 5 --
.../core/server/impl/PostOfficeJournalLoader.java | 4 --
tests/config/logging.properties | 6 +--
tests/config/logging.properties.trace | 57 ---------------------
.../integration/replication/ReplicationTest.java | 4 --
9 files changed, 3 insertions(+), 143 deletions(-)
delete mode 100644 tests/config/logging.properties.trace
[activemq-artemis] 02/02: NO-JIRA removing runDirectJournalBlast
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 67d47274a10a84928f002bd203c036d81088e390
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue May 11 18:53:54 2021 -0400
NO-JIRA removing runDirectJournalBlast
---
.../jdbc/store/journal/JDBCJournalImpl.java | 4 --
.../activemq/artemis/core/journal/Journal.java | 2 -
.../core/journal/impl/FileWrapperJournal.java | 5 --
.../artemis/core/journal/impl/JournalImpl.java | 59 ----------------------
.../core/replication/ReplicatedJournal.java | 5 --
.../core/server/impl/PostOfficeJournalLoader.java | 4 --
.../integration/replication/ReplicationTest.java | 4 --
7 files changed, 83 deletions(-)
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 56a260b..c5ef737 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -969,10 +969,6 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- }
-
- @Override
public Map<Long, JournalFile> createFilesForBackupSync(long[] fileIds) throws Exception {
return null;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
index 7c652af..0c27cf4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
@@ -257,8 +257,6 @@ public interface Journal extends ActiveMQComponent {
int getUserVersion();
- void runDirectJournalBlast() throws Exception;
-
/**
* Reserves journal file IDs, creates the necessary files for synchronization, and places
* references to these (reserved for sync) files in the map.
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
index 536c7e7..0434cf2 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
@@ -323,11 +323,6 @@ public final class FileWrapperJournal extends JournalBase {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- throw new UnsupportedOperationException();
- }
-
- @Override
public JournalLoadInformation loadSyncOnly(JournalState state) throws Exception {
throw new UnsupportedOperationException();
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index 57120f4..d8e2e84 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -402,65 +402,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
@Override
- public void runDirectJournalBlast() throws Exception {
- final int numIts = 100000000;
-
- ActiveMQJournalLogger.LOGGER.runningJournalBlast(numIts);
-
- final CountDownLatch latch = new CountDownLatch(numIts * 2);
-
- class MyAIOCallback implements IOCompletion {
-
- @Override
- public void done() {
- latch.countDown();
- }
-
- @Override
- public void onError(final int errorCode, final String errorMessage) {
-
- }
-
- @Override
- public void storeLineUp() {
- }
- }
-
- final MyAIOCallback task = new MyAIOCallback();
-
- final int recordSize = 1024;
-
- final byte[] bytes = new byte[recordSize];
-
- class MyRecord implements EncodingSupport {
-
- @Override
- public void decode(final ActiveMQBuffer buffer) {
- }
-
- @Override
- public void encode(final ActiveMQBuffer buffer) {
- buffer.writeBytes(bytes);
- }
-
- @Override
- public int getEncodeSize() {
- return recordSize;
- }
-
- }
-
- MyRecord record = new MyRecord();
-
- for (int i = 0; i < numIts; i++) {
- appendAddRecord(i, (byte) 1, record, true, task);
- appendDeleteRecord(i, true, task);
- }
-
- latch.await();
- }
-
- @Override
public ConcurrentLongHashMap<JournalRecord> getRecords() {
return records;
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
index 5a5ffb8..21d7fc1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
@@ -567,11 +567,6 @@ public class ReplicatedJournal implements Journal {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- localJournal.runDirectJournalBlast();
- }
-
- @Override
public int getUserVersion() {
return localJournal.getUserVersion();
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index af707d4..4c5865d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -290,10 +290,6 @@ public class PostOfficeJournalLoader implements JournalLoader {
queue.resume();
}
}
-
- if (System.getProperty("org.apache.activemq.opt.directblast") != null) {
- messageJournal.runDirectJournalBlast();
- }
}
@Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 13674bd..9622b46 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -970,10 +970,6 @@ public final class ReplicationTest extends ActiveMQTestBase {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- }
-
- @Override
public int getUserVersion() {
return 0;
}
[activemq-artemis] 01/02: NO-JIRA fixing logging.properties
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4727be6a69849944bb0b0f4cb1df26ed250f2e62
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue May 11 17:22:38 2021 -0400
NO-JIRA fixing logging.properties
---
tests/config/logging.properties | 6 ++--
tests/config/logging.properties.trace | 57 -----------------------------------
2 files changed, 3 insertions(+), 60 deletions(-)
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index 14e40a9..2742fac 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -17,13 +17,13 @@
# Additional logger names to configure (root logger is always configured)
# Root logger option
-loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.smoke,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests,org.apache.activemq.cli.test,org.apache.activemq.audit,org.apache.activemq.audit.message
+loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.core.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.smoke,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests,org.apache.activemq.cli.test,org.apache.activemq.audit,org.apache.activemq.audit.message
# Root logger level
logger.level=INFO
# ActiveMQ Artemis logger levels
logger.org.apache.activemq.artemis.core.server.level=INFO
-logger.org.apache.activemq.artemis.journal.level=INFO
+logger.org.apache.activemq.artemis.core.journal.level=INFO
logger.org.apache.activemq.artemis.utils.level=INFO
logger.org.apache.activemq.artemis.jms.level=INFO
logger.org.apache.activemq.artemis.ra.level=INFO
@@ -48,7 +48,7 @@ logger.org.apache.activemq.audit.useParentHandlers=false
# Console handler configuration
handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=FINE
+handler.CONSOLE.level=TRACE
handler.CONSOLE.autoFlush=true
handler.CONSOLE.formatter=PATTERN
diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace
deleted file mode 100644
index cd6e364..0000000
--- a/tests/config/logging.properties.trace
+++ /dev/null
@@ -1,57 +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
-#
-# http://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.
-#
-
-# this is an example of a logging configuration where you could enable tracing at the testsuite
-
-# Additional logger names to configure (root logger is always configured)
-# Root logger option
-loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.activemq.artemis.utils,org.apache.activemq.artemis.journal,org.apache.activemq.artemis.jms,org.apache.activemq.artemis.ra,org.apache.activemq.artemis.tests.unit,org.apache.activemq.artemis.tests.integration,org.apache.activemq.artemis.jms.tests
-
-# Root logger level
-logger.level=TRACE
-
-# Root logger handlers
-logger.handlers=CONSOLE,TEST,FILE
-#logger.handlers=CONSOLE,FILE
-
-# Console handler configuration
-handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
-handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=INFO
-handler.CONSOLE.autoFlush=true
-handler.CONSOLE.formatter=PATTERN
-
-# File handler configuration
-handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=TRACE
-handler.FILE.properties=autoFlush,fileName
-handler.FILE.autoFlush=true
-handler.FILE.fileName=target/activemq.log
-handler.FILE.formatter=PATTERN
-
-# Test handler
-handler.TEST=org.apache.activemq.artemis.logs.AssertionLoggerHandler
-handler.TEST.level=TRACE
-handler.TEST.formatter=PATTERN
-
-# Formatter pattern configuration
-formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
-formatter.PATTERN.properties=pattern
-#formatter.PATTERN.pattern=[%t] %d{HH:mm:ss,SSS} %-5p [%c] %s%E%n
-
-# Alternate format useful when debugging
-formatter.PATTERN.pattern=*** [%t] ***\n%d{HH:mm:ss,SSS} %-5p [%c] %s%E%n\n