Permalink
Browse files

ISPN-1970: remove all of the deprecated elements from the XSD and

all of the configurations and samples. Users using old schemas
(<=5.1) will be able to use the deprecated elements / attributes but
will get warnings about them as usual
  • Loading branch information...
1 parent c727353 commit 03e02eb1138fcdb03618602d600304ea7237a1e7 @tristantarrant tristantarrant committed with galderz Apr 6, 2012
@@ -78,29 +78,29 @@
<namedCache name="syncRepl">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<sync replTimeout="15000"/>
</clustering>
</namedCache>
<namedCache name="asyncRepl">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<async asyncMarshalling="false"/>
</clustering>
</namedCache>
<namedCache name="asyncReplQueue">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<async useReplQueue="true" replQueueInterval="1234" replQueueMaxElements="100"/>
</clustering>
</namedCache>
<namedCache name="txSyncRepl">
<transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"/>
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<sync replTimeout="15000"/>
</clustering>
</namedCache>
@@ -255,12 +255,12 @@
<clustering mode="replication">
<!--
- Defines whether to retrieve state on startup. This is only valud for 'replication' mode.
+ Configures how state is transferred between the nodes
-->
- <stateRetrieval
+ <stateTransfer
timeout="240000"
fetchInMemoryState="false"
- alwaysProvideInMemoryState="false"
+ chunkSize="10000"
/>
<!--
@@ -693,13 +693,6 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="wakeUpInterval" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- Deprecated, set on expiration instead. Interval (in milliseconds) between subsequent runs to purge expired entries from memory and any cache stores. If you wish to disable the periodic eviction process altogether, set wakeupInterval to -1.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="expiration" minOccurs="0">
@@ -779,71 +772,6 @@
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element name="stateRetrieval" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Configures how state is retrieved when a new cache joins the cluster. Used with invalidation and replication clustered modes.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="alwaysProvideInMemoryState" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>
- If true, this will allow the cache to provide in-memory state to a neighbor, even if the cache is not configured to fetch state from its neighbors (fetchInMemoryState is false)
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="fetchInMemoryState" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>
- If true, this will cause the cache to ask neighboring caches for state when it starts up, so the cache starts 'warm', although it will impact startup time.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="initialRetryWaitTime" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- Initial wait time when backing off before retrying state transfer retrieval
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="logFlushTimeout" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- This is the maximum amount of time to run a cluster-wide flush, to allow for syncing of transaction logs.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="maxNonProgressingLogWrites" type="xs:int">
- <xs:annotation>
- <xs:documentation>
- This is the maximum number of non-progressing transaction log writes after which a brute-force flush approach is resorted to, to synchronize transaction logs.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="numRetries" type="xs:int">
- <xs:annotation>
- <xs:documentation>
- Number of state retrieval retries before giving up and aborting startup.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="retryWaitTimeIncreaseFactor" type="xs:int">
- <xs:annotation>
- <xs:documentation>
- Wait time increase factor over successive state retrieval backoffs
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="timeout" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- This is the maximum amount of time - in milliseconds - to wait for state from neighboring caches, before throwing an exception and aborting startup.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
<xs:element name="stateTransfer" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -1016,27 +944,6 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="rehashEnabled" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>
- If false, no rebalancing or rehashing will take place when a new node joins the cluster or a node leaves
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="rehashRpcTimeout" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- Rehashing timeout
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="rehashWait" type="xs:long">
- <xs:annotation>
- <xs:documentation>
- TODO
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>
@@ -68,13 +68,14 @@
<default name="foo">
<clustering mode="DIST">
<async asyncMarshalling="true" replQueueClass="com.acme.replQueue" replQueueInterval="1" replQueueMaxElements="1" useReplQueue="true"/>
- <hash class="com.acme.Hash" hashFunctionClass="com.acme.HashFunction" numOwners="1" numVirtualNodes="1" rehashEnabled="true" rehashRpcTimeout="1" rehashWait="1">
+ <hash class="com.acme.Hash" hashFunctionClass="com.acme.HashFunction" numOwners="1" numVirtualNodes="1">
<groups enabled="true">
<grouper class="com.acme.Grouper"/>
</groups>
</hash>
<l1 enabled="true" invalidationThreshold="1" lifespan="1" onRehash="true"/>
- <stateRetrieval alwaysProvideInMemoryState="true" fetchInMemoryState="true" initialRetryWaitTime="1" logFlushTimeout="1" maxNonProgressingLogWrites="1" numRetries="1" retryWaitTimeIncreaseFactor="1" timeout="1"/>
+ <stateTransfer chunkSize="10000" fetchInMemoryState="true" timeout="1"/>
+
<sync replTimeout="1"/>
</clustering>
<customInterceptors>
@@ -103,21 +103,21 @@
<namedCache name="syncRepl">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<sync replTimeout="15000"/>
</clustering>
</namedCache>
<namedCache name="asyncRepl">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<async asyncMarshalling="false"/>
</clustering>
</namedCache>
<namedCache name="asyncReplQueue">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<async useReplQueue="true" replQueueInterval="1234" replQueueMaxElements="100"/>
</clustering>
</namedCache>
@@ -104,7 +104,7 @@
<namedCache name="withRecoveryAndAsync">
<clustering mode="repl">
- <stateRetrieval fetchInMemoryState="false"/>
+ <stateTransfer fetchInMemoryState="false"/>
<async asyncMarshalling="false"/>
</clustering>
@@ -46,7 +46,7 @@
<namedCache name="metadata">
<clustering mode="r">
<sync replTimeout="60000" />
- <stateRetrieval fetchInMemoryState="true" />
+ <stateTransfer fetchInMemoryState="true" />
</clustering>
</namedCache>
</infinispan>
@@ -49,10 +49,9 @@
/>
<jmxStatistics enabled="true"/>
<clustering mode="replication">
- <stateRetrieval
+ <stateTransfer
timeout="240000"
fetchInMemoryState="false"
- alwaysProvideInMemoryState="false"
/>
<sync replTimeout="20000"/>
</clustering>
@@ -231,9 +231,9 @@
<clustering mode="replication">
<!--
- Defines whether to retrieve state on startup. This is only valud for 'replication' mode.
+ Configures state transfer
-->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" alwaysProvideInMemoryState="false" />
+ <stateTransfer timeout="20000" fetchInMemoryState="false" />
<!--
Network calls are synchronous.
@@ -53,7 +53,7 @@
<namedCache name="testCache">
<clustering mode="replication">
- <stateRetrieval fetchInMemoryState="true"/>
+ <stateTransfer fetchInMemoryState="true"/>
<sync/>
</clustering>
@@ -231,9 +231,9 @@
<clustering mode="replication">
<!--
- Defines whether to retrieve state on startup. This is only valud for 'replication' mode.
+ Configures state transfer
-->
- <stateRetrieval timeout="20000" fetchInMemoryState="false" alwaysProvideInMemoryState="false" />
+ <stateTransfer timeout="20000" fetchInMemoryState="false" />
<!--
Network calls are synchronous.

0 comments on commit 03e02eb

Please sign in to comment.