Skip to content

Commit

Permalink
Merge pull request #474 from bmomcilov/feature/transaction-manager-ab…
Browse files Browse the repository at this point in the history 
…ort-on-misconfigured-groups

TransactionManager: abort on misconfigured groups
  • Loading branch information
@ar
ar authored Mar 14, 2022
2 parents 392b547 + 7bd8220 commit c573536
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 10 deletions.
7 changes: 6 additions & 1 deletion jpos/src/main/java/org/jpos/transaction/TransactionManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class TransactionManager
boolean profiler;
boolean doRecover;
boolean callSelectorOnAbort;
boolean abortOnMisconfiguredGroups;
int sessions;
int maxSessions;
int threshold;
Expand Down Expand Up @@ -450,6 +451,7 @@ public void setConfiguration (Configuration cfg)
callSelectorOnAbort = cfg.getBoolean("call-selector-on-abort", true);
if (profiler)
metrics = new Metrics(new AtomicHistogram(cfg.getLong("metrics-highest-trackable-value", 60000), 2));
abortOnMisconfiguredGroups = cfg.getBoolean("abort-on-misconfigured-groups");
}
public void addListener (TransactionStatusListener l) {
synchronized (statusListeners) {
Expand Down Expand Up @@ -691,8 +693,11 @@ session, TransactionStatusEvent.State.PREPARING, id, getName(p), context
while (st.hasMoreTokens ()) {
String grp = st.nextToken();
addGroup (id, grp);
if (evt != null && groups.get(grp) == null)
if (evt != null && groups.get(grp) == null) {
evt.addMessage (" WARNING: group '" + grp + "' not configured");
if (abortOnMisconfiguredGroups)
abort = true;
}
participants.addAll (getParticipants (grp));
}
while (iter.hasNext())
Expand Down
68 changes: 59 additions & 9 deletions jpos/src/test/java/org/jpos/transaction/TransactionManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,28 @@

import static org.apache.commons.lang3.JavaVersion.JAVA_14;
import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
import static org.jpos.transaction.TransactionConstants.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.*;

import java.io.File;
import java.io.IOException;
import java.io.NotActiveException;
import java.io.SerializablePermission;
import java.io.UnsupportedEncodingException;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.List;
import java.io.*;
import java.util.*;

import org.jdom2.Comment;
import org.jdom2.Element;
import org.jpos.core.Configuration;
import org.jpos.core.ConfigurationException;
import org.jpos.core.SimpleConfiguration;
import org.jpos.core.SubConfiguration;
import org.jpos.space.SpaceFactory;
import org.jpos.transaction.participant.BSHTransactionParticipant;
import org.jpos.transaction.participant.CheckPoint;
import org.jpos.transaction.participant.Debug;
Expand Down Expand Up @@ -453,7 +452,58 @@ public void testPrepare8() throws Throwable {
LogEvent evt = new LogEvent();
int result = transactionManager.prepare(1, 100L, Boolean.TRUE, new ArrayList(), arrayList.iterator(), false, evt, null);
assertEquals(3, evt.getPayLoad().size(), "evt.payLoad.size()");
assertEquals(TransactionConstants.PREPARED, result, "result");
assertEquals(PREPARED, result, "result");
}

@Test
public void testPrepareAbortsOnMisconfiguredGroup() throws Throwable {
transactionManager = new TransactionManager();
transactionManager.psp = SpaceFactory.getSpace();
transactionManager.groups = Collections.emptyMap();
transactionManager.abortOnMisconfiguredGroups = true;
transactionManager.setName(transactionManager.getClass().getSimpleName());

TransactionParticipant participant = mock(TransactionParticipant.class);
when(participant.prepare(anyLong(), any())).thenReturn(PREPARED | NO_JOIN);

GroupSelector selector = mock(GroupSelector.class);
when(selector.prepare(anyLong(), any())).thenReturn(PREPARED | NO_JOIN);
when(selector.select(anyLong(), any())).thenReturn("Lorem ipsum dolor sit amet");

List<TransactionParticipant> list = Arrays.asList(participant, selector);
LogEvent evt = new LogEvent();

int result = transactionManager.prepare(1, 100L, Boolean.FALSE, members, list.iterator(), false, evt, null);

verify(participant, times(1)).prepare(anyLong(), any());
verify(selector, times(1)).prepare(anyLong(), any());
verify(selector, times(1)).select(anyLong(), any());
assertEquals(ABORTED, result);
}

@Test
public void testPrepareShouldNotAbortOnMisconfiguredGroupByDefault() throws Throwable {
transactionManager = new TransactionManager();
transactionManager.psp = SpaceFactory.getSpace();
transactionManager.groups = Collections.emptyMap();
transactionManager.setName(transactionManager.getClass().getSimpleName());

TransactionParticipant participant = mock(TransactionParticipant.class);
when(participant.prepare(anyLong(), any())).thenReturn(PREPARED);

GroupSelector selector = mock(GroupSelector.class);
when(selector.prepare(anyLong(), any())).thenReturn(PREPARED);
when(selector.select(anyLong(), any())).thenReturn("Lorem ipsum dolor sit amet");

List<TransactionParticipant> list = Arrays.asList(participant, selector);
LogEvent evt = new LogEvent();

int result = transactionManager.prepare(1, 100L, Boolean.FALSE, members, list.iterator(), false, evt, null);

verify(participant, times(1)).prepare(anyLong(), any());
verify(selector, times(1)).prepare(anyLong(), any());
verify(selector, times(1)).select(anyLong(), any());
assertEquals(PREPARED, result);
}

@Test
Expand Down

0 comments on commit c573536

Please sign in to comment.