Merge branch 'hotfix-1.8.x' into hotfix-1.9.x

LTS-CHANGELOG.adoc

@@ -17,6 +17,14 @@ include::content/docs/variables.adoc-include[]
 The LTS changelog lists releases which are only accessible via a commercial subscription.
 All fixes and changes in LTS releases will be released the next minor release. Changes from LTS 1.4.x will be included in release 1.5.0.
 
+[[v1.9.14]]
+== 1.9.14 (TBD)
+
+icon:check[] Monitoring: Calling the `/health/ready` endpoint while restoring an OrientDB backup would block the request. If too many requests were blocked in this way, Mesh would
+be considered not live any more. This has been fixed now, during a restore, the endpoint `/health/ready` will now fail immediately while the liveness status will be maintained.
+
+icon:check[] Monitoring: Failing calls to any `/health/...` endpoints will no longer log the whole stacktrace, since this does not contain useful information.
+
 [[v1.9.13]]
 == 1.9.13 (22.03.2023)
 
@@ -46,6 +54,14 @@ icon:check[] Core: The node migration process has been improved to reduce resour
 
 icon:check[] Core: Corner case of updating the webroot info might throw a false conflict exception, when the segment field value is reset for a schema. This has been fixed.
 
+[[v1.8.21]]
+== 1.8.21 (TBD)
+
+icon:check[] Monitoring: Calling the `/health/ready` endpoint while restoring an OrientDB backup would block the request. If too many requests were blocked in this way, Mesh would
+be considered not live any more. This has been fixed now, during a restore, the endpoint `/health/ready` will now fail immediately while the liveness status will be maintained.
+
+icon:check[] Monitoring: Failing calls to any `/health/...` endpoints will no longer log the whole stacktrace, since this does not contain useful information.
+
 [[v1.8.20]]
 == 1.8.20 (22.03.2023)
 

common/src/main/java/com/gentics/mesh/router/route/AbstractInternalEndpoint.java

@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.core.db.Database;
 import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
@@ -32,15 +30,15 @@ public abstract class AbstractInternalEndpoint implements InternalEndpoint {
 
 	protected RouterStorage routerStorage;
 
-	@Inject
-	public LocalConfigApi localConfigApi;
+	protected final LocalConfigApi localConfigApi;
 
-	@Inject
-	public Database db;
+	protected final Database db;
 
-	protected AbstractInternalEndpoint(String basePath, MeshAuthChainImpl chain) {
+	protected AbstractInternalEndpoint(String basePath, MeshAuthChainImpl chain, LocalConfigApi localConfigApi, Database db) {
 		this.basePath = basePath;
 		this.chain = chain;
+		this.localConfigApi = localConfigApi;
+		this.db = db;
 	}
 
 	@Override

common/src/main/java/com/gentics/mesh/router/route/AbstractProjectEndpoint.java

@@ -2,6 +2,8 @@
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.cli.BootstrapInitializer;
+import com.gentics.mesh.core.db.Database;
+import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
 import com.gentics.mesh.router.RouterStorage;
 
 import io.vertx.core.Vertx;
@@ -14,8 +16,8 @@ public abstract class AbstractProjectEndpoint extends AbstractInternalEndpoint {
 
 	protected BootstrapInitializer boot;
 
-	protected AbstractProjectEndpoint(String basePath, MeshAuthChainImpl chain, BootstrapInitializer boot) {
-		super(basePath, chain);
+	protected AbstractProjectEndpoint(String basePath, MeshAuthChainImpl chain, BootstrapInitializer boot, LocalConfigApi localConfigApi, Database db) {
+		super(basePath, chain, localConfigApi, db);
 		this.boot = boot;
 	}
 

core/src/main/java/com/gentics/mesh/cli/CoreVerticleLoader.java

@@ -29,28 +29,30 @@ public class CoreVerticleLoader {
 
 	private static Logger log = LoggerFactory.getLogger(CoreVerticleLoader.class);
 
-	@Inject
-	public Provider<RestAPIVerticle> restVerticle;
+	protected final Provider<RestAPIVerticle> restVerticle;
 
-	@Inject
-	public Provider<MonitoringServerVerticle> monitoringServerVerticle;
+	protected final Provider<MonitoringServerVerticle> monitoringServerVerticle;
 
-	@Inject
-	public JobWorkerVerticleImpl jobWorkerVerticle;
+	protected final JobWorkerVerticleImpl jobWorkerVerticle;
 
-	@Inject
-	public Provider<ElasticsearchProcessVerticle> elasticsearchProcessVerticleProvider;
+	protected final Provider<ElasticsearchProcessVerticle> elasticsearchProcessVerticleProvider;
 	private ElasticsearchProcessVerticle elasticsearchProcessVerticle;
 
-	@Inject
-	public MeshOptions meshOptions;
+	protected final MeshOptions meshOptions;
 
 	private final Vertx rxVertx;
 	private String searchVerticleId;
 
 	@Inject
-	public CoreVerticleLoader(Vertx rxVertx) {
+	public CoreVerticleLoader(Vertx rxVertx, Provider<RestAPIVerticle> restVerticle,
+			Provider<MonitoringServerVerticle> monitoringServerVerticle, JobWorkerVerticleImpl jobWorkerVerticle,
+			Provider<ElasticsearchProcessVerticle> elasticsearchProcessVerticleProvider, MeshOptions meshOptions) {
 		this.rxVertx = rxVertx;
+		this.restVerticle = restVerticle;
+		this.monitoringServerVerticle = monitoringServerVerticle;
+		this.jobWorkerVerticle = jobWorkerVerticle;
+		this.elasticsearchProcessVerticleProvider = elasticsearchProcessVerticleProvider;
+		this.meshOptions = meshOptions;
 	}
 
 	private JsonObject defaultConfig;

core/src/main/java/com/gentics/mesh/core/endpoint/admin/AdminEndpoint.java

@@ -30,6 +30,7 @@
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.context.InternalActionContext;
 import com.gentics.mesh.context.impl.InternalRoutingActionContextImpl;
+import com.gentics.mesh.core.db.Database;
 import com.gentics.mesh.core.endpoint.admin.consistency.ConsistencyCheckHandler;
 import com.gentics.mesh.core.endpoint.admin.debuginfo.DebugInfoHandler;
 import com.gentics.mesh.core.endpoint.admin.plugin.PluginHandler;
@@ -66,8 +67,8 @@ public class AdminEndpoint extends AbstractInternalEndpoint {
 	@Inject
 	public AdminEndpoint(MeshAuthChainImpl chain, AdminHandler adminHandler, JobHandler jobHandler, ConsistencyCheckHandler consistencyHandler,
 		PluginHandler pluginHandler, DebugInfoHandler debugInfoHandler, LocalConfigHandler localConfigHandler, ShutdownHandler shutdownHandler,
-		HandlerUtilities handlerUtilities) {
-		super("admin", chain);
+		HandlerUtilities handlerUtilities, LocalConfigApi localConfigApi, Database db) {
+		super("admin", chain, localConfigApi, db);
 		this.adminHandler = adminHandler;
 		this.jobHandler = jobHandler;
 		this.consistencyHandler = consistencyHandler;
@@ -79,7 +80,7 @@ public AdminEndpoint(MeshAuthChainImpl chain, AdminHandler adminHandler, JobHand
 	}
 
 	public AdminEndpoint() {
-		super("admin", null);
+		super("admin", null, null, null);
 	}
 
 	@Override

core/src/main/java/com/gentics/mesh/core/endpoint/admin/HealthEndpoint.java

@@ -5,6 +5,7 @@
 import javax.inject.Inject;
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
+import com.gentics.mesh.core.db.Database;
 import com.gentics.mesh.core.endpoint.handler.MonitoringCrudHandler;
 import com.gentics.mesh.rest.InternalEndpointRoute;
 import com.gentics.mesh.router.route.AbstractInternalEndpoint;
@@ -17,13 +18,13 @@ public class HealthEndpoint extends AbstractInternalEndpoint {
 	private MonitoringCrudHandler monitoringCrudHandler;
 
 	@Inject
-	public HealthEndpoint(MeshAuthChainImpl chain, MonitoringCrudHandler monitoringCrudHandler) {
-		super("health", chain);
+	public HealthEndpoint(MeshAuthChainImpl chain, MonitoringCrudHandler monitoringCrudHandler, LocalConfigApi localConfigApi, Database db) {
+		super("health", chain, localConfigApi, db);
 		this.monitoringCrudHandler = monitoringCrudHandler;
 	}
 
 	public HealthEndpoint() {
-		super("health", null);
+		super("health", null, null, null);
 	}
 
 	@Override

core/src/main/java/com/gentics/mesh/core/endpoint/admin/RestInfoEndpoint.java

@@ -9,6 +9,7 @@
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.context.InternalActionContext;
+import com.gentics.mesh.core.db.Database;
 import com.gentics.mesh.example.RestInfoExamples;
 import com.gentics.mesh.rest.InternalEndpointRoute;
 import com.gentics.mesh.router.RouterStorage;
@@ -29,13 +30,13 @@ public class RestInfoEndpoint extends AbstractInternalEndpoint {
 	private RouterStorage routerStorage;
 
 	@Inject
-	public RestInfoEndpoint(MeshAuthChainImpl chain, AdminHandler adminHandler) {
-		super(null, chain);
+	public RestInfoEndpoint(MeshAuthChainImpl chain, AdminHandler adminHandler, LocalConfigApi localConfigApi, Database db) {
+		super(null, chain, localConfigApi, db);
 		this.adminHandler = adminHandler;
 	}
 
 	public RestInfoEndpoint(String path) {
-		super(path, null);
+		super(path, null, null, null);
 	}
 
 	@Override

core/src/main/java/com/gentics/mesh/core/endpoint/auth/AuthenticationEndpoint.java

@@ -9,6 +9,8 @@
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.auth.MeshBasicAuthLoginHandler;
+import com.gentics.mesh.core.db.Database;
+import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
 import com.gentics.mesh.rest.InternalEndpointRoute;
 import com.gentics.mesh.router.route.AbstractInternalEndpoint;
 
@@ -22,14 +24,14 @@ public class AuthenticationEndpoint extends AbstractInternalEndpoint {
 	private MeshBasicAuthLoginHandler basicAuthLoginHandler;
 
 	@Inject
-	public AuthenticationEndpoint(MeshAuthChainImpl chain, AuthenticationRestHandler authRestHandler, MeshBasicAuthLoginHandler basicAuthHandler) {
-		super("auth", chain);
+	public AuthenticationEndpoint(MeshAuthChainImpl chain, AuthenticationRestHandler authRestHandler, MeshBasicAuthLoginHandler basicAuthHandler, LocalConfigApi localConfigApi, Database db) {
+		super("auth", chain, localConfigApi, db);
 		this.authRestHandler = authRestHandler;
 		this.basicAuthLoginHandler = basicAuthHandler;
 	}
 
 	public AuthenticationEndpoint() {
-		super("auth", null);
+		super("auth", null, null, null);
 	}
 
 	@Override

core/src/main/java/com/gentics/mesh/core/endpoint/branch/BranchEndpoint.java

@@ -28,6 +28,8 @@
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.cli.BootstrapInitializer;
 import com.gentics.mesh.context.InternalActionContext;
+import com.gentics.mesh.core.db.Database;
+import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
 import com.gentics.mesh.parameter.impl.GenericParametersImpl;
 import com.gentics.mesh.parameter.impl.PagingParametersImpl;
 import com.gentics.mesh.rest.InternalEndpointRoute;
@@ -41,12 +43,12 @@ public class BranchEndpoint extends AbstractProjectEndpoint {
 	private BranchCrudHandler crudHandler;
 
 	public BranchEndpoint() {
-		super("branches", null, null);
+		super("branches", null, null, null, null);
 	}
 
 	@Inject
-	public BranchEndpoint(MeshAuthChainImpl chain, BootstrapInitializer boot, BranchCrudHandler crudHandler) {
-		super("branches", chain, boot);
+	public BranchEndpoint(MeshAuthChainImpl chain, BootstrapInitializer boot, BranchCrudHandler crudHandler, LocalConfigApi localConfigApi, Database db) {
+		super("branches", chain, boot, localConfigApi, db);
 		this.crudHandler = crudHandler;
 	}
 

core/src/main/java/com/gentics/mesh/core/endpoint/eventbus/EventbusEndpoint.java

@@ -3,6 +3,8 @@
 import javax.inject.Inject;
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
+import com.gentics.mesh.core.db.Database;
+import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
 import com.gentics.mesh.core.rest.MeshEvent;
 import com.gentics.mesh.rest.InternalEndpointRoute;
 import com.gentics.mesh.router.route.AbstractInternalEndpoint;
@@ -27,13 +29,13 @@ public class EventbusEndpoint extends AbstractInternalEndpoint {
 	private final Vertx vertx;
 
 	public EventbusEndpoint() {
-		super("eventbus", null);
+		super("eventbus", null, null, null);
 		this.vertx = null;
 	}
 
 	@Inject
-	public EventbusEndpoint(Vertx vertx, MeshAuthChainImpl chain) {
-		super("eventbus", chain);
+	public EventbusEndpoint(Vertx vertx, MeshAuthChainImpl chain, LocalConfigApi localConfigApi, Database db) {
+		super("eventbus", chain, localConfigApi, db);
 		this.vertx = vertx;
 	}
 

core/src/main/java/com/gentics/mesh/core/endpoint/group/GroupEndpoint.java

@@ -24,6 +24,8 @@
 
 import com.gentics.mesh.auth.MeshAuthChainImpl;
 import com.gentics.mesh.context.InternalActionContext;
+import com.gentics.mesh.core.db.Database;
+import com.gentics.mesh.core.endpoint.admin.LocalConfigApi;
 import com.gentics.mesh.parameter.impl.GenericParametersImpl;
 import com.gentics.mesh.parameter.impl.PagingParametersImpl;
 import com.gentics.mesh.parameter.impl.RolePermissionParametersImpl;
@@ -38,12 +40,12 @@ public class GroupEndpoint extends AbstractInternalEndpoint {
 	private GroupCrudHandler crudHandler;
 
 	public GroupEndpoint() {
-		super("groups", null);
+		super("groups", null, null, null);
 	}
 
 	@Inject
-	public GroupEndpoint(MeshAuthChainImpl chain, GroupCrudHandler crudHandler) {
-		super("groups", chain);
+	public GroupEndpoint(MeshAuthChainImpl chain, GroupCrudHandler crudHandler, LocalConfigApi localConfigApi, Database db) {
+		super("groups", chain, localConfigApi, db);
 		this.crudHandler = crudHandler;
 	}