From 8f72f71f16b96f9805c376d0effde5fe6bc95fe3 Mon Sep 17 00:00:00 2001 From: mbhave Date: Tue, 21 Apr 2020 10:40:43 +0100 Subject: [PATCH 1/3] Search-2121: Add Docker setting to disable Cascade tracking --- search-services/packaging/src/docker/6.x/docker-compose.yml | 2 ++ search-services/packaging/src/docker/search_config_setup.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/search-services/packaging/src/docker/6.x/docker-compose.yml b/search-services/packaging/src/docker/6.x/docker-compose.yml index 13b5861e9..ffa3f4133 100644 --- a/search-services/packaging/src/docker/6.x/docker-compose.yml +++ b/search-services/packaging/src/docker/6.x/docker-compose.yml @@ -70,6 +70,8 @@ services: - ALFRESCO_SECURE_COMMS=none #Enable Spellcheck by setting to true - ENABLE_SPELLCHECK=${SEARCH_ENABLE_SPELLCHECK} + #Disable cascade tracking by setting to true + - DISABLE_CASCADE_TRACKING=${DISABLE_CASCADE_TRACKING} ports: - 8083:8983 #Browser port diff --git a/search-services/packaging/src/docker/search_config_setup.sh b/search-services/packaging/src/docker/search_config_setup.sh index 0d2ef18a1..35c1360d8 100644 --- a/search-services/packaging/src/docker/search_config_setup.sh +++ b/search-services/packaging/src/docker/search_config_setup.sh @@ -101,4 +101,8 @@ if [[ true == "$ENABLE_SPELLCHECK" ]]; then sed -i 's/#alfresco.suggestable.property/alfresco.suggestable.property/' ${PWD}/solrhome/conf/shared.properties fi +if [[ true == "$DISABLE_CASCADE_TRACKING" ]]; then + sed -i 's/alfresco.cascade.tracker.enabled=true/alfresco.cascade.tracker.enabled=false/' ${PWD}/solrhome/conf/shared.properties +fi + bash -c "$@" \ No newline at end of file From e7e08e3757253c912831e8694cbf6168a162d4ad Mon Sep 17 00:00:00 2001 From: mbhave Date: Tue, 21 Apr 2020 10:43:42 +0100 Subject: [PATCH 2/3] Updated comment to suggest default for disable cascade tracking --- search-services/packaging/src/docker/6.x/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/packaging/src/docker/6.x/docker-compose.yml b/search-services/packaging/src/docker/6.x/docker-compose.yml index ffa3f4133..afb2633e4 100644 --- a/search-services/packaging/src/docker/6.x/docker-compose.yml +++ b/search-services/packaging/src/docker/6.x/docker-compose.yml @@ -70,7 +70,7 @@ services: - ALFRESCO_SECURE_COMMS=none #Enable Spellcheck by setting to true - ENABLE_SPELLCHECK=${SEARCH_ENABLE_SPELLCHECK} - #Disable cascade tracking by setting to true + #Disable cascade tracking by setting to true, default false - as cascade tracking is enabled. - DISABLE_CASCADE_TRACKING=${DISABLE_CASCADE_TRACKING} ports: - 8083:8983 #Browser port From ee8a899893859177ba7296efb7d3a58c0e2e4c0f Mon Sep 17 00:00:00 2001 From: mbhave Date: Tue, 21 Apr 2020 11:42:49 +0100 Subject: [PATCH 3/3] Search-2121: Added new test group to tag the tests to be excluded when cascade tracker is disabled --- e2e-test/src/main/java/org/alfresco/search/TestGroup.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java index 8da8c14e8..f08879c17 100644 --- a/e2e-test/src/main/java/org/alfresco/search/TestGroup.java +++ b/e2e-test/src/main/java/org/alfresco/search/TestGroup.java @@ -34,6 +34,8 @@ public class TestGroup public static final String CONFIG_SHARDING_EXPLICIT ="CONFIG_Sharding_EXPLICIT"; // Alfresco search services using sharded environment and explicit routing public static final String CONFIG_SHARDING_DB_ID_RANGE = "CONFIG_Sharding_DB_ID_RANGE"; // Alfresco Search Services using Sharding with DB_ID_RANGE + public static final String CONFIG_DISABLE_CASCADE_TRACKER ="Config_Disable_Cascade_Tracker"; // Alfresco search services does not index fields related to cascaded updates + public static final String NOT_INSIGHT_ENGINE = "Not_InsightEngine"; // When Alfresco Insight Engine 1.0 isn't running public static final String ACS_52n = "ACS_52n"; // Alfresco Content Services 5.2.n