You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/11/24 10:13:56 UTC
[phoenix] branch 4.x updated: PHOENIX-6231 Update Omid to 1.0.2
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new c3818ee PHOENIX-6231 Update Omid to 1.0.2
c3818ee is described below
commit c3818ee2a7b07c43e961f432c173531157d4f6d9
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Nov 23 10:35:10 2020 +0100
PHOENIX-6231 Update Omid to 1.0.2
---
.../org/apache/phoenix/transaction/OmidTransactionProvider.java | 8 +++++---
pom.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index b1b9a62..9247248 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -119,7 +119,7 @@ public class OmidTransactionProvider implements PhoenixTransactionProvider {
public CommitTable.Client getCommitTableClient() {
return commitTableClient;
}
-
+
@Override
public PhoenixTransactionService getTransactionService(Configuration config, ConnectionInfo connectionInfo, int port) throws SQLException{
TSOServerConfig tsoConfig = new TSOServerConfig();
@@ -132,7 +132,8 @@ public class OmidTransactionProvider implements PhoenixTransactionProvider {
Injector injector = Guice.createInjector(new TSOMockModule(tsoConfig));
tso = injector.getInstance(TSOServer.class);
- tso.startAndWait();
+ tso.startAsync();
+ tso.awaitRunning();
OmidClientConfiguration clientConfig = new OmidClientConfiguration();
clientConfig.setConnectionString("localhost:" + port);
@@ -183,7 +184,8 @@ public class OmidTransactionProvider implements PhoenixTransactionProvider {
transactionManager.close();
}
if (tso != null) {
- tso.stopAndWait();
+ tso.stopAsync();
+ tso.awaitTerminated();
}
}
}
diff --git a/pom.xml b/pom.xml
index dcddcfe..fa38842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<avatica.version>1.12.0</avatica.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
<tephra.version>0.15.0-incubating</tephra.version>
- <omid.version>1.0.1</omid.version>
+ <omid.version>1.0.2</omid.version>
<spark.version>2.4.0</spark.version>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>