Prepare changelog; Update shade plugin config; Fix threading lock/rac…

…e condition for nested ES threads.
gentics · Sep 18, 2017 · c57750e · c57750e
1 parent 6d38229
commit c57750e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 30 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -2,25 +2,23 @@
 
 = Gentics Mesh Changelog
 
-== 0.10.3 (TBD)
+== 0.10.3 (18.09.2017)
 
-icon:plus[] Logging: The `logback.xml` default logging configuration file will now by placed in the `config` folder which can be used to customize the logging configuration.
+icon:plus[] Logging: The `logback.xml` default logging configuration file will now be placed in the `config` folder. The file can be used to customize the logging configuration.
 
-icon:plus[] Configuration: It is now possible to set custom properties within the elasticsearch setting. 
+icon:plus[] Configuration: It is now possible to set custom properties within the elasticsearch setting.
 
 icon:plus[] Core: The OrientDB graph database version was updated to version 2.2.27
 
 icon:plus[] REST: It is now possible to set and read permissions using paths which contain the project name. Example:  `GET /api/v1/roles/:roleUuid/permissions/:projectName/...`
 
-== 0.10.2 (14.09.2017)
-
-icon:book[] Documentation: The new link:https://getmesh.io/docs/beta/security.html[security] and link:https://getmesh.io/docs/beta/performance.html[performance] sections have been added to our documentation.
+icon:check[] Search: A potential race condition has been fixed. This condition previously caused the elasticsearch to no longer accept any changes.
 
-icon:check[] Java REST Client: A potential threading issue within the Java REST Client has been fixed. Vert.x http clients will no longer be shared across multiple threads.
+icon:check[] Performance: The REST API performance has been improved by optimizing the JSON generation process. link:https://github.com/gentics/mesh/issues/141[#141]
 
-icon:check[] Memory: Reduce memory footprint of microschema migrations.
+== 0.10.2 (14.09.2017)
 
-icon:check[] Fixed handling "required" and "allow" properties of schema fields when adding fields to schemas.
+icon:book[] Documentation: The new link:https://getmesh.io/docs/beta/security.html[security] and link:https://getmesh.io/docs/beta/performance.html[performance] sections have been added to our documentation.
 
 icon:plus[] The *Webroot-Response-Type* header can now be used to differentiate between a webroot binary and node responses. The values of this header can either be *binary* or *node*.
 
@@ -30,6 +28,12 @@ icon:plus[] The `/api/v1/admin/status/migrations` endpoint was removed.
 icon:plus[] The `/api/v1/:projectName/release/:releaseUuid/schemas` and `/api/v1/:projectName/release/:releaseUuid/microschemas` endpoint has been reworked.
             The response format has been updated. The status and uuid of the job which has been invoked when the migration was started will now also be included in this response. 
 
+icon:check[] Java REST Client: A potential threading issue within the Java REST Client has been fixed. Vert.x http clients will no longer be shared across multiple threads.
+
+icon:check[] Memory: Reduce memory footprint of microschema migrations. link:https://github.com/gentics/mesh/issues/135[#135]
+
+icon:check[] Fixed handling "required" and "allow" properties of schema fields when adding fields to schemas.
+
 == 0.10.1 (08.09.2017)
 
 icon:plus[] Clustering: Added link:https://getmesh.io/docs/beta/clustering.html#_node_discovery[documentation] and support for cluster configurations which use a list of static IPs instead of multicast discovery.

diff --git a/databases/orientdb/src/main/java/com/gentics/mesh/graphdb/OrientDBDatabase.java b/databases/orientdb/src/main/java/com/gentics/mesh/graphdb/OrientDBDatabase.java
@@ -772,7 +772,7 @@ public <T> T tx(TxAction<T> txHandler) {
 				log.error("Error handling transaction", e);
 				throw new RuntimeException("Transaction error", e);
 			}
-			if (log.isDebugEnabled()) {
+			if (!handlerFinished && log.isDebugEnabled()) {
 				log.debug("Retrying .. {" + retry + "}");
 			}
 			if (handlerFinished) {

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -157,14 +157,6 @@
 						</goals>
 						<configuration>
 							<filters>
-								<filter>
-									<artifact>org.elasticsearch:elasticsearch</artifact>
-									<excludes>
-										<exclude>META-INF/services/org.apache.lucene.codecs.Codec</exclude>
-										<exclude>META-INF/services/org.apache.lucene.codecs.DocValuesFormat</exclude>
-										<exclude>META-INF/services/org.apache.lucene.codecs.PostingsFormat</exclude>
-									</excludes>
-								</filter>
 								<filter>
 									<artifact>*:*</artifact>
 									<excludes>
@@ -178,6 +170,7 @@
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>com.gentics.mesh.demo.DemoRunner</mainClass>
 								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
 							</transformers>
 						</configuration>
 					</execution>

diff --git a/elasticsearch/src/main/java/com/gentics/mesh/search/index/entry/AbstractIndexHandler.java b/elasticsearch/src/main/java/com/gentics/mesh/search/index/entry/AbstractIndexHandler.java
@@ -24,7 +24,7 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.search.SearchHit;
 
-import com.syncleus.ferma.tx.Tx;
+import com.gentics.mesh.Mesh;
 import com.gentics.mesh.cli.BootstrapInitializer;
 import com.gentics.mesh.context.InternalActionContext;
 import com.gentics.mesh.core.data.IndexableElement;
@@ -44,12 +44,14 @@
 import com.gentics.mesh.parameter.PagingParameters;
 import com.gentics.mesh.search.SearchProvider;
 import com.gentics.mesh.search.index.Transformator;
-import com.tinkerpop.gremlin.Tokens.T;
+import com.syncleus.ferma.tx.Tx;
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.logging.Logger;
 import io.vertx.core.logging.LoggerFactory;
+import io.vertx.rx.java.RxHelper;
 import rx.Completable;
+import rx.Scheduler;
 
 /**
  * Abstract class for index handlers.
@@ -188,6 +190,8 @@ public Completable updateMapping(String indexName, String documentType) {
 
 		final String normalizedDocumentType = documentType.toLowerCase();
 		if (searchProvider.getNode() != null) {
+			Scheduler scheduler = RxHelper.blockingScheduler(Mesh.vertx());
+
 			return Completable.create(sub -> {
 
 				org.elasticsearch.node.Node node = getESNode();
@@ -213,7 +217,7 @@ public void onFailure(Throwable e) {
 						sub.onError(e);
 					}
 				});
-			});
+			}).observeOn(scheduler);
 		} else {
 			return Completable.complete();
 		}

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 	<parent>
 		<groupId>com.gentics.vertx</groupId>
 		<artifactId>maven-vertx-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 	</parent>
 
 	<developers>

diff --git a/server/pom.xml b/server/pom.xml
@@ -87,14 +87,6 @@
 						</goals>
 						<configuration>
 							<filters>
-								<filter>
-									<artifact>org.elasticsearch:elasticsearch</artifact>
-									<excludes>
-										<exclude>META-INF/services/org.apache.lucene.codecs.Codec</exclude>
-										<exclude>META-INF/services/org.apache.lucene.codecs.DocValuesFormat</exclude>
-										<exclude>META-INF/services/org.apache.lucene.codecs.PostingsFormat</exclude>
-									</excludes>
-								</filter>
 								<filter>
 									<artifact>*:*</artifact>
 									<excludes>
@@ -108,6 +100,7 @@
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>com.gentics.mesh.server.ServerRunner</mainClass>
 								</transformer>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
 							</transformers>
 						</configuration>
 					</execution>