You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/05/20 15:03:11 UTC
[ignite-teamcity-bot] branch master updated: Small changes related
to configs
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new fe4d519 Small changes related to configs
fe4d519 is described below
commit fe4d5190b23625ca89e8fd945d65201639da761d
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon May 20 17:41:01 2019 +0300
Small changes related to configs
---
.../java/org/apache/ignite/ci/db/Ignite1Init.java | 20 +++++--------------
.../org/apache/ignite/ci/db/Ignite2Configurer.java | 2 ++
.../java/org/apache/ignite/ci/db/TcHelperDb.java | 7 ++-----
.../java/org/apache/ignite/ci/web/CtxListener.java | 23 ++++++++++++++++++----
4 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
index 8fc7b8a..7fa2473 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite1Init.java
@@ -72,12 +72,6 @@ public class Ignite1Init {
protected String ignitionStart() {
System.out.println("Starting Ignite Server Node, " + Version.VERSION);
- /* try {
- Thread.sleep(30*1000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }*/
-
final IgniteConfiguration cfg = getIgniteConfiguration();
this.ignite = Ignition.start(cfg);
@@ -90,11 +84,7 @@ public class Ignite1Init {
@AutoProfiling
protected String activate() {
System.out.println("Activating Ignite Server Node, " + Version.VERSION);
- /* try {
- Thread.sleep(30*1000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }*/
+
ignite.cluster().active(true);
System.out.println("Activate Completed");
@@ -140,13 +130,13 @@ public class Ignite1Init {
}
public Future<Ignite> getIgniteFuture() {
- final FutureTask<Ignite> futureTask = new FutureTask<>(this::init);
+ final FutureTask<Ignite> futTask = new FutureTask<>(this::init);
- if (igniteFutureRef.compareAndSet(null, futureTask)) {
- final Thread thread = new Thread(futureTask, "ignite-1-init-thread");
+ if (igniteFutureRef.compareAndSet(null, futTask)) {
+ final Thread thread = new Thread(futTask, "ignite-1-init-thread");
thread.start();
- return futureTask;
+ return futTask;
}
else
return igniteFutureRef.get();
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
index ddb4f6f..0091c59 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/Ignite2Configurer.java
@@ -121,8 +121,10 @@ public class Ignite2Configurer {
static DataStorageConfiguration getDataStorageConfiguration(DataRegionConfiguration regConf) {
return new DataStorageConfiguration()
+ // .setWalCompactionEnabled(true)
.setWalMode(WALMode.LOG_ONLY)
.setWalHistorySize(1)
+ // .setMaxWalArchiveSize(4L * 1024 * 1024 * 1024)
.setCheckpointFrequency(5 * 60 * 1000)
.setWriteThrottlingEnabled(true)
.setDefaultDataRegionConfiguration(regConf);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
index 960eccd..9f5a224 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java
@@ -96,11 +96,8 @@ public class TcHelperDb {
/** */
@NotNull
public static <K, V> CacheConfiguration<K, V> getCacheV3Config(String name) {
- CacheConfiguration<K, V> ccfg = new CacheConfiguration<>(name);
-
- ccfg.setAffinity(new RendezvousAffinityFunction(false, 8));
-
- return ccfg;
+ return new CacheConfiguration<K, V>(name)
+ .setAffinity(new RendezvousAffinityFunction(false, 8));
}
/** */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java
index 8cae89f..bce83c5 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/CtxListener.java
@@ -21,6 +21,7 @@ import com.google.common.base.Preconditions;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.io.IOException;
+import javax.annotation.Nullable;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -32,12 +33,15 @@ import org.apache.ignite.ci.observer.BuildObserver;
import org.apache.ignite.ci.tcbot.issue.IssueDetector;
import org.apache.ignite.ci.teamcity.pure.TeamcityRecorder;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class CtxListener implements ServletContextListener {
/** Javax.Injector property code for servlet context. */
public static final String INJECTOR = "injector";
+ @Nullable private static volatile Logger logger;
public static Injector getInjector(ServletContext ctx) {
return (Injector)ctx.getAttribute(INJECTOR);
@@ -70,6 +74,8 @@ public class CtxListener implements ServletContextListener {
rootLog.removeHandler(handlers[i]);
org.slf4j.bridge.SLF4JBridgeHandler.install();
+
+ logger = LoggerFactory.getLogger(CtxListener.class);
}
/** {@inheritDoc} */
@@ -79,7 +85,6 @@ public class CtxListener implements ServletContextListener {
Injector injector = getInjector(ctx);
try {
-
injector.getInstance(IssueDetector.class).stop();
injector.getInstance(TcUpdatePool.class).stop();
injector.getInstance(BuildObserver.class).stop();
@@ -88,19 +93,29 @@ public class CtxListener implements ServletContextListener {
}
catch (Exception e) {
e.printStackTrace();
+
+ if (logger != null)
+ logger.error("Exception during shutdown: " + e.getMessage(), e);
}
try {
injector.getInstance(TeamcityRecorder.class).stop();
- } catch (IOException e) {
- e.printStackTrace();
}
+ catch (IOException e) {
+ e.printStackTrace();
+ if (logger != null)
+ logger.error("Exception during shutdown: " + e.getMessage(), e);
+ }
try {
TcHelperDb.stop(injector.getInstance(Ignite.class));
- } catch (Exception e) {
+ }
+ catch (Exception e) {
e.printStackTrace();
+
+ if (logger != null)
+ logger.error("Exception during shutdown: " + e.getMessage(), e);
}
}
}