Skip to content

Commit

Permalink
Remove the /clusterbench-granular deployment and replace with a provi…
Browse files Browse the repository at this point in the history 
…ded CLI script (resolves clusterbench#387)
  • Loading branch information
@rhusar
rhusar committed Sep 12, 2024
1 parent 6ab3315 commit de6e797
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 243 deletions.
13 changes: 9 additions & 4 deletions README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ renaming it accordingly to the desired context, typically to `clusterbench.war`
cp ~/git/clusterbench/clusterbench-ee10-web/target/clusterbench-ee10-web-tomcat.war webapps/clusterbench.war
----

Note that CDI, debug, EJB, granular, JSF servlets are unsupported on Tomcat and not bundled in the `war`.
That makes the session servlet the only one available for benchmarking.
Note that CDI, EJB, JSF, granular, and debug servlets are unsupported on Tomcat and not bundled in the `war`.
That makes the session servlet the only one available for performance benchmarking.

=== Deploying to OpenShift

Expand Down Expand Up @@ -184,10 +184,12 @@ Stores serial and data in `@jakarta.ejb.Stateful` Jakarta Enterprise Bean (SFSB)

==== GranularSessionServlet

http://localhost:8080/clusterbench-granular/granular[/clusterbench-granular/granular]
http://localhost:8080/clusterbench/granular[/clusterbench/granular]

Stores serial number and data separately and are both directly put to `jakarta.servlet.http.HttpSession`.
The byte array is never changed therefore this can be used to test effectiveness of using granular session replication.
The byte array is never changed and thus can be used to test the efficiency of using granular session replication.

CAUTION: The server configuration in use *must* be configured with `ATTRIBUTE` session granularity!

=== Load Servlets

Expand Down Expand Up @@ -228,6 +230,9 @@ The `/scripts` directory contains CLI scripts for reconfiguring the application
|===
| Script | Description

| 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.

Expand Down
7 changes: 0 additions & 7 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,6 @@
<classifier>passivating</classifier>
<type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<version>${project.version}</version>
<classifier>granular</classifier>
<type>war</type>
</dependency>
</dependencies>
</dependencyManagement>
</project>
44 changes: 0 additions & 44 deletions clusterbench-ee10-ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@
<classifier>passivating</classifier>
<type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<type>war</type>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -83,13 +77,6 @@
<contextRoot>/clusterbench-passivating</contextRoot>
<bundleFileName>clusterbench-ee10-web-passivating.war</bundleFileName>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<contextRoot>/clusterbench-granular</contextRoot>
<bundleFileName>clusterbench-ee10-web-granular.war</bundleFileName>
</webModule>
</modules>
</configuration>
</plugin>
Expand Down Expand Up @@ -170,13 +157,6 @@
<contextRoot>/clusterbench-passivating</contextRoot>
<bundleFileName>b.war</bundleFileName>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<contextRoot>/clusterbench-granular</contextRoot>
<bundleFileName>c.war</bundleFileName>
</webModule>
</modules>
</configuration>
</plugin>
Expand Down Expand Up @@ -308,12 +288,6 @@
<classifier>passivating</classifier>
<contextRoot>/clusterbench-passivating</contextRoot>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<contextRoot>/clusterbench-granular</contextRoot>
</webModule>
</modules>
</configuration>
</plugin>
Expand Down Expand Up @@ -359,12 +333,6 @@
<classifier>passivating</classifier>
<contextRoot>/clusterbench-passivating1</contextRoot>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<contextRoot>/clusterbench-granular1</contextRoot>
</webModule>
</modules>
</configuration>
</execution>
Expand Down Expand Up @@ -398,12 +366,6 @@
<classifier>passivating</classifier>
<contextRoot>/clusterbench-passivating2</contextRoot>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<contextRoot>/clusterbench-granular2</contextRoot>
</webModule>
</modules>
</configuration>
</execution>
Expand Down Expand Up @@ -471,12 +433,6 @@
<classifier>passivating</classifier>
<excluded>true</excluded>
</webModule>
<webModule>
<groupId>${project.groupId}</groupId>
<artifactId>clusterbench-ee10-web</artifactId>
<classifier>granular</classifier>
<excluded>true</excluded>
</webModule>
</modules>
</configuration>
</plugin>
Expand Down
36 changes: 4 additions & 32 deletions clusterbench-ee10-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<packagingExcludes>%regex[.*/(cdi|debug|ejb|granular|jsf).*]</packagingExcludes>
</configuration>
</execution>
<!-- Build default configuration: session granularity and never passivates. -->
<!-- Build default configuration -->
<execution>
<id>build-default-war</id>
<phase>package</phase>
Expand All @@ -152,15 +152,15 @@
</webResources>
<webappDirectory>${project.build.directory}/${project.build.finalName}-default</webappDirectory>
<warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory>
<packagingExcludes>%regex[.*granular.*],%regex[.*clusterbench-common.*]</packagingExcludes>
<packagingExcludes>%regex[.*clusterbench-common.*]</packagingExcludes>
<archive>
<manifestEntries>
<Dependencies>org.jgroups</Dependencies>
</manifestEntries>
</archive>
</configuration>
</execution>
<!-- Build passivating configuration: session granularity but passivation enabled. -->
<!-- Build passivating configuration -->
<execution>
<id>build-passivating-war</id>
<phase>package</phase>
Expand All @@ -180,35 +180,7 @@
</webResources>
<webappDirectory>${project.build.directory}/${project.build.finalName}-passivating</webappDirectory>
<warSourceDirectory>${basedir}/src/main/webapp-passivating</warSourceDirectory>
<packagingExcludes>%regex[.*granular.*],%regex[.*clusterbench-common.*]</packagingExcludes>
<archive>
<manifestEntries>
<Dependencies>org.jgroups</Dependencies>
</manifestEntries>
</archive>
</configuration>
</execution>
<!-- Build granular configuration: attribute granularity but never passivates. -->
<execution>
<id>build-granular-war</id>
<phase>package</phase>
<goals>
<goal>war</goal>
</goals>
<configuration>
<classifier>granular</classifier>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp-granular</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<webappDirectory>${project.build.directory}/${project.build.finalName}-granular</webappDirectory>
<warSourceDirectory>${basedir}/src/main/webapp-granular</warSourceDirectory>
<packagingExcludes>%regex[.*/(cdi|ejb|jsf|load|session).*],%regex[.*clusterbench-common.*]</packagingExcludes>
<packagingExcludes>%regex[.*clusterbench-common.*]</packagingExcludes>
<archive>
<manifestEntries>
<Dependencies>org.jgroups</Dependencies>
Expand Down
16 changes: 0 additions & 16 deletions clusterbench-ee10-web/src/main/webapp-granular/WEB-INF/jboss-web.xml
View file

This file was deleted.

54 changes: 0 additions & 54 deletions clusterbench-ee10-web/src/main/webapp-granular/WEB-INF/web.xml
View file

This file was deleted.

48 changes: 0 additions & 48 deletions clusterbench-ee10-web/src/main/webapp-granular/error.jsp
View file

This file was deleted.

Binary file removed clusterbench-ee10-web/src/main/webapp-granular/favicon.ico
View file
Binary file not shown.
29 changes: 0 additions & 29 deletions clusterbench-ee10-web/src/main/webapp-granular/index.html
View file

This file was deleted.

9 changes: 0 additions & 9 deletions clusterbench-ee10-web/src/main/webapp-granular/login.jsp
View file

This file was deleted.

Loading

0 comments on commit de6e797

Please sign in to comment.