From 389e96179ac0af1d99b35ea55477022cf9a011e5 Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Wed, 18 Sep 2024 12:51:18 +0200 Subject: [PATCH] Simplify the configuration scripts (resolves #507) --- README.adoc | 10 +++++----- scripts/infinispan-session-management-attribute.cli | 6 +----- ...inispan-session-management-offload-attribute.cli | 13 ------------- ...nfinispan-session-management-offload-session.cli | 13 ------------- scripts/infinispan-session-management-offload.cli | 9 +++++++++ 5 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 scripts/infinispan-session-management-offload-attribute.cli delete mode 100644 scripts/infinispan-session-management-offload-session.cli create mode 100644 scripts/infinispan-session-management-offload.cli diff --git a/README.adoc b/README.adoc index 2d3c7e30..4ef7653f 100644 --- a/README.adoc +++ b/README.adoc @@ -225,7 +225,9 @@ Servlet which prints out the node name as a value of the `jboss.node.name` syste == Server Configurations -The `/scripts` directory contains CLI scripts for reconfiguring the application server for specific test scenarios: +The `scripts` directory at the root of the repository contains CLI scripts +for reconfiguring the application server for specific test scenarios. +These scripts can be combined to achieve a desired resulting configuration. |=== | Script | Description @@ -233,11 +235,9 @@ The `/scripts` directory contains CLI scripts for reconfiguring the application | infinispan-session-management-attribute.cli | Reconfigures the default session manager to use `ATTRIBUTE` granularity. -| infinispan-session-management-offload-attribute.cli -| Reconfigures the default session manager to use cache `offload` with `ATTRIBUTE` granularity. +| infinispan-session-management-offload.cli +| Reconfigures the default session manager to use cache `offload`. -| infinispan-session-management-offload-session.cli -| Reconfigures the default session manager to use cache `offload` with `SESSION` granularity. |=== == Custom Build Profiles diff --git a/scripts/infinispan-session-management-attribute.cli b/scripts/infinispan-session-management-attribute.cli index 9ec9f5be..0bbd04a7 100644 --- a/scripts/infinispan-session-management-attribute.cli +++ b/scripts/infinispan-session-management-attribute.cli @@ -5,8 +5,4 @@ # This script reconfigures the default session manager to use `ATTRIBUTE` granularity. -batch -/subsystem=distributable-web/infinispan-session-management=granular:add(cache-container=web, granularity=ATTRIBUTE) -/subsystem=distributable-web/infinispan-session-management=granular/affinity=primary-owner:add() -/subsystem=distributable-web:write-attribute(name=default-session-management, value=granular) -run-batch +/subsystem=distributable-web/infinispan-session-management=default:write-attribute(name=granularity, value=ATTRIBUTE) {allow-resource-service-restart=true} diff --git a/scripts/infinispan-session-management-offload-attribute.cli b/scripts/infinispan-session-management-offload-attribute.cli deleted file mode 100644 index bba5d87f..00000000 --- a/scripts/infinispan-session-management-offload-attribute.cli +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright The ClusterBench Authors -# SPDX-License-Identifier: Apache-2.0 -# - -# This script reconfigures the default session manager to use cache `offload` with `ATTRIBUTE` granularity. -# Running this requires the given `offload` cache to be already pre-configured in the `web` cache container. - -batch -/subsystem=distributable-web/infinispan-session-management=offload:add(cache-container=web, cache=offload, granularity=ATTRIBUTE) -/subsystem=distributable-web/infinispan-session-management=offload/affinity=primary-owner:add() -/subsystem=distributable-web:write-attribute(name=default-session-management, value=offload) -run-batch diff --git a/scripts/infinispan-session-management-offload-session.cli b/scripts/infinispan-session-management-offload-session.cli deleted file mode 100644 index 0dbfef88..00000000 --- a/scripts/infinispan-session-management-offload-session.cli +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright The ClusterBench Authors -# SPDX-License-Identifier: Apache-2.0 -# - -# This script reconfigures the default session manager to use cache `offload` with `SESSION` granularity. -# Running this requires the given `offload` cache to be already pre-configured in the `web` cache container. - -batch -/subsystem=distributable-web/infinispan-session-management=offload:add(cache-container=web, cache=offload, granularity=SESSION) -/subsystem=distributable-web/infinispan-session-management=offload/affinity=primary-owner:add() -/subsystem=distributable-web:write-attribute(name=default-session-management, value=offload) -run-batch diff --git a/scripts/infinispan-session-management-offload.cli b/scripts/infinispan-session-management-offload.cli new file mode 100644 index 00000000..e5f98e7f --- /dev/null +++ b/scripts/infinispan-session-management-offload.cli @@ -0,0 +1,9 @@ +# +# Copyright The ClusterBench Authors +# SPDX-License-Identifier: Apache-2.0 +# + +# This script reconfigures the default session manager to use cache `offload`. +# Running this requires the given `offload` cache to be already pre-configured in the `web` cache container. + +/subsystem=distributable-web/infinispan-session-management=default:write-attribute(name=cache, value=offload) {allow-resource-service-restart=true}