TEIID-5138 creating a fork channel for ha and removing deprecations

teiid · Nov 21, 2017 · 35c7f59 · 35c7f59
1 parent 55c4b5e
commit 35c7f59
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/...gration-feature-pack/src/main/resources/content/bin/scripts/teiid-domain-mode-install.cli b/...gration-feature-pack/src/main/resources/content/bin/scripts/teiid-domain-mode-install.cli
@@ -31,19 +31,19 @@ connect
 /profile=ha/subsystem=jgroups/channel=ee/fork=teiid-cluster:add()
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache:add()
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/transport=TRANSPORT:add(lock-timeout=60000, channel=teiid-cluster)
-/profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC, batching=true)
+/profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/expiration=EXPIRATION:add(lifespan=7200000)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/transaction=TRANSACTION:add(mode=NON_XA)
 
-/profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add(batching=true)
+/profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add()
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/expiration=EXPIRATION:add(lifespan=7200000)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/transaction=TRANSACTION:add(mode=NON_XA)
 
-/profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add(batching=true)
+/profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add()
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/expiration=EXPIRATION:add(lifespan=28800)
 /profile=ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/eviction=EVICTION:add(max-entries=512, strategy=LIRS)
@@ -56,19 +56,19 @@ connect
 /profile=full-ha/subsystem=jgroups/channel=ee/fork=teiid-cluster:add()
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache:add()
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/transport=TRANSPORT:add(lock-timeout=60000, channel=teiid-cluster)
-/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC, batching=true)
+/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/expiration=EXPIRATION:add(lifespan=7200000)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/transaction=TRANSACTION:add(mode=NON_XA)
 
-/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add(batching=true)
+/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add()
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/expiration=EXPIRATION:add(lifespan=7200000)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/transaction=TRANSACTION:add(mode=NON_XA)
 
-/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add(batching=true)
+/profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add()
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/locking=LOCKING:add(isolation=READ_COMMITTED)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/expiration=EXPIRATION:add(lifespan=28800)
 /profile=full-ha/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/eviction=EVICTION:add(max-entries=512, strategy=LIRS)

diff --git a/...-feature-pack/src/main/resources/content/bin/scripts/teiid-standalone-ha-mode-install.cli b/...-feature-pack/src/main/resources/content/bin/scripts/teiid-standalone-ha-mode-install.cli
@@ -12,21 +12,22 @@ connect
 /subsystem=logging/logger=org.teiid.AUDIT_LOG:add 
 /subsystem=logging/logger=org.teiid.AUDIT_LOG:write-attribute(name="level", value="WARN")
 
+/subsystem=jgroups/channel=ee/fork=teiid-cluster:add()
 /subsystem=infinispan/cache-container=teiid-cache:add()
-/subsystem=infinispan/cache-container=teiid-cache/transport=TRANSPORT:add(lock-timeout=60000)
-/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC, batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/transport=jgroups:add(lock-timeout=60000)
+/subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl:add(mode=SYNC)
 /subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/expiration=EXPIRATION:add(lifespan=7200000)
 /subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /subsystem=infinispan/cache-container=teiid-cache/replicated-cache=resultset-repl/transaction=TRANSACTION:add(mode=NON_XA)
 
-/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add(batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add()
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/expiration=EXPIRATION:add(lifespan=7200000)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/transaction=TRANSACTION:add(mode=NON_XA)
 
-/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add(batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add()
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/expiration=EXPIRATION:add(lifespan=28800)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/eviction=EVICTION:add(max-entries=512, strategy=LIRS)
@@ -36,7 +37,7 @@ connect
 /subsystem=security/security-domain=teiid-security/authentication=classic:add()
 /subsystem=security/security-domain=teiid-security/authentication=classic/login-module=RealmDirect:add(code=RealmDirect, flag=sufficient, module-options=[("password-stacking"=>"useFirstPass")])
 
-/subsystem=teiid:add(authentication-security-domain=teiid-security, resultset-cache-infinispan-container=teiid-cache, distributed-cache-jgroups-stack=udp, preparedplan-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid)
+/subsystem=teiid:add(authentication-security-domain=teiid-security, resultset-cache-infinispan-container=teiid-cache, distributed-cache-jgroups-stack=teiid-cluster, preparedplan-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid)
 /subsystem=teiid/transport=local:add()
 /subsystem=teiid/transport=odata:add()
 /subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc)

diff --git a/...ion-feature-pack/src/main/resources/content/bin/scripts/teiid-standalone-mode-install.cli b/...ion-feature-pack/src/main/resources/content/bin/scripts/teiid-standalone-mode-install.cli
@@ -13,19 +13,19 @@ connect
 /subsystem=logging/logger=org.teiid.AUDIT_LOG:write-attribute(name="level", value="WARN")
 
 /subsystem=infinispan/cache-container=teiid-cache:add()
-/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl:add(batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl:add()
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl/expiration=EXPIRATION:add(lifespan=7200000)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset-repl/transaction=TRANSACTION:add(mode=NON_XA)
 
-/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add(batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset:add()
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/expiration=EXPIRATION:add(lifespan=7200000)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/eviction=EVICTION:add(max-entries=1024, strategy=LIRS)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=resultset/transaction=TRANSACTION:add(mode=NON_XA)
 
-/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add(batching=true)
+/subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan:add()
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/locking=LOCKING:add(isolation=READ_COMMITTED)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/expiration=EXPIRATION:add(lifespan=28800)
 /subsystem=infinispan/cache-container=teiid-cache/local-cache=preparedplan/eviction=EVICTION:add(max-entries=512, strategy=LIRS)