diff options
author | Harald Musum <musum@oath.com> | 2018-01-24 08:34:52 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-01-24 08:34:52 +0100 |
commit | 032db7be29b1ac4444b88f4662d1f5a45acb7bcd (patch) | |
tree | 5c137ca219551520ed41e9ae75b6ff3e89df37e5 | |
parent | d479ecf9a91b3d80822807d856f110eb19d988c4 (diff) |
Remove transaction commit in mock provisioner that should never have been there
3 files changed, 16 insertions, 2 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java index 2c677441c68..0f20ca3163b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java @@ -38,7 +38,6 @@ import java.util.Optional; * Base class for session handler tests * * @author hmusum - * @since 5.1.14 */ public class SessionHandlerTest { @@ -233,7 +232,6 @@ public class SessionHandlerTest { @Override public void activate(NestedTransaction transaction, ApplicationId application, Collection<HostSpec> hosts) { - transaction.commit(); activated = true; lastApplicationId = application; lastHosts = hosts; diff --git a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java index 8953263df20..c860e9ead4f 100644 --- a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java +++ b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java @@ -88,6 +88,11 @@ public final class NestedTransaction implements AutoCloseable { transaction.transaction.close(); } + @Override + public String toString() { + return String.join(",", transactions.stream().map(Object::toString).collect(Collectors.toList())); + } + private List<Transaction> organizeTransactions(List<ConstrainedTransaction> transactions) { return orderTransactions(combineTransactions(transactions), findOrderingConstraints(transactions)); } @@ -174,6 +179,11 @@ public final class NestedTransaction implements AutoCloseable { /** Returns transaction types which should commit after this */ public Class<? extends Transaction>[] before() { return before; } + @Override + public String toString() { + return transaction.toString(); + } + } private static class OrderingConstraint { diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java index 9c9ba96a90f..5e11a650953 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java @@ -6,6 +6,7 @@ import com.yahoo.vespa.curator.Curator; import org.apache.curator.framework.api.transaction.CuratorTransactionFinal; import java.util.List; +import java.util.stream.Collectors; /** * Transaction implementation against ZooKeeper. @@ -65,4 +66,9 @@ public class CuratorTransaction extends AbstractTransaction { } } + @Override + public String toString() { + return String.join(",", operations().stream().map(operation -> operation.toString()).collect(Collectors.toList())); + } + } |