Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updating configs, fixing len/newlen bug in CacheLoaderChunkInputStrea…
…m and updating JQL query in JQLConverterIT
- Loading branch information
Showing
12 changed files
with
74 additions
and
183 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
fcrepo-configs/src/main/resources/config/infinispan/clustered/infinispan.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
fcrepo-configs/src/main/resources/config/infinispan/file/infinispan.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
fcrepo-configs/src/main/resources/config/infinispan/ram/infinispan.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 36 additions & 127 deletions
163
fcrepo-kernel-impl/src/test/resources/config/testing/infinispan-basic.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,153 +1,62 @@ | ||
| <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" | ||
| xmlns="urn:infinispan:config:5.2"> | ||
| xmlns="urn:infinispan:config:6.0" | ||
| xsi:schemaLocation="urn:infinispan:config:6.0 http://www.infinispan.org/schemas/infinispan-config-6.0.xsd"> | ||
|
|
||
| <global> | ||
| <globalJmxStatistics enabled="true" allowDuplicateDomains="true"/> | ||
| <globalJmxStatistics enabled="false" allowDuplicateDomains="true"/> | ||
| </global> | ||
|
|
||
| <default> | ||
| </default> | ||
|
|
||
|
|
||
| <namedCache name="FedoraRepository"> | ||
|
|
||
| <eviction maxEntries="500" strategy="LIRS" threadPolicy="DEFAULT"/> | ||
|
|
||
| <transaction | ||
| transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" | ||
| transactionMode="TRANSACTIONAL" lockingMode="PESSIMISTIC"/> | ||
| <!-- | ||
| Define the cache loaders (i.e., cache stores). Passivation is false because we want *all* | ||
| data to be persisted, not just what doesn't fit into memory. Shared is false because there | ||
| are no other caches sharing this file store. We set preload to false for lazy loading; | ||
| may be improved by preloading and configuring eviction. | ||
| We can have multiple cache loaders, which get chained. But we'll define just one. | ||
| --> | ||
|
|
||
| <loaders passivation="false" shared="false" preload="false"> | ||
| transactionMode="TRANSACTIONAL" | ||
| lockingMode="OPTIMISTIC"/> | ||
|
|
||
| <persistence passivation="false"> | ||
| <singleFile shared="false" | ||
| preload="false" | ||
| fetchPersistentState="false" | ||
| purgeOnStartup="false" | ||
| location="target/fedora_repository/store"> | ||
| </singleFile> | ||
| </persistence> | ||
|
|
||
| <!-- | ||
| The 'fetchPersistentState' attribute applies when this cache joins the cluster; the value doesn't | ||
| really matter to us in this case. See the documentation for more options. | ||
| --> | ||
| <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true" | ||
| purgeOnStartup="false"> | ||
| <!-- See the documentation for more configuration examples and flags. --> | ||
| <properties> | ||
| <!-- We have to set the location where we want to store the data. --> | ||
| <property name="location" value="${fcrepo.ispn.repo.CacheDirPath:target/FedoraRepository/storage}"/> | ||
|
|
||
| <property name="fsyncMode" value="perWrite"/> | ||
| </properties> | ||
| <!-- This repository isn't clustered, so we could set up the SingletonStore. | ||
| singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/> | ||
| --> | ||
| <!-- | ||
| We could use "write-behind", which actually writes to the file system asynchronously, | ||
| which can improve performance as seen by the JCR client. | ||
| Plus changes are coalesced, meaning that if multiple changes are enqueued for the | ||
| same node, only the last one is written. (This is good much of the time, but not | ||
| always.) | ||
| <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/> | ||
| --> | ||
| </loader> | ||
|
|
||
| </loaders> | ||
| </namedCache> | ||
|
|
||
| <namedCache name="FedoraRepositoryMetaData"> | ||
|
|
||
| <eviction maxEntries="500" strategy="LIRS" threadPolicy="DEFAULT"/> | ||
|
|
||
| <transaction | ||
| transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" | ||
| transactionMode="TRANSACTIONAL" lockingMode="PESSIMISTIC"/> | ||
| <!-- | ||
| Define the cache loaders (i.e., cache stores). Passivation is false because we want *all* | ||
| data to be persisted, not just what doesn't fit into memory. Shared is false because there | ||
| are no other caches sharing this file store. We set preload to false for lazy loading; | ||
| may be improved by preloading and configuring eviction. | ||
| We can have multiple cache loaders, which get chained. But we'll define just one. | ||
| --> | ||
| transactionMode="TRANSACTIONAL" | ||
| lockingMode="OPTIMISTIC"/> | ||
|
|
||
| <persistence passivation="false"> | ||
| <singleFile shared="false" | ||
| preload="false" | ||
| fetchPersistentState="false" | ||
| purgeOnStartup="false" | ||
| location="target/fedora_repository/md_store"> | ||
| </singleFile> | ||
| </persistence> | ||
|
|
||
| <loaders passivation="false" shared="false" preload="false"> | ||
|
|
||
| <!-- | ||
| The 'fetchPersistentState' attribute applies when this cache joins the cluster; the value doesn't | ||
| really matter to us in this case. See the documentation for more options. | ||
| --> | ||
| <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true" | ||
| purgeOnStartup="false"> | ||
| <!-- See the documentation for more configuration examples and flags. --> | ||
| <properties> | ||
| <!-- We have to set the location where we want to store the data. --> | ||
| <property name="location" value="${fcrepo.ispn.CacheDirPath:target/FedoraRepositoryMetaData/storage}"/> | ||
|
|
||
| <property name="fsyncMode" value="perWrite"/> | ||
| </properties> | ||
| <!-- This repository isn't clustered, so we could set up the SingletonStore. | ||
| singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/> | ||
| --> | ||
| <!-- | ||
| We could use "write-behind", which actually writes to the file system asynchronously, | ||
| which can improve performance as seen by the JCR client. | ||
| Plus changes are coalesced, meaning that if multiple changes are enqueued for the | ||
| same node, only the last one is written. (This is good much of the time, but not | ||
| always.) | ||
| <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/> | ||
| --> | ||
| </loader> | ||
|
|
||
| </loaders> | ||
| </namedCache> | ||
|
|
||
| <namedCache name="FedoraRepositoryBinaryData"> | ||
|
|
||
| <eviction maxEntries="100" strategy="LIRS" threadPolicy="DEFAULT"/> | ||
|
|
||
| <transaction | ||
| transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" | ||
| transactionMode="TRANSACTIONAL" lockingMode="PESSIMISTIC"/> | ||
| <!-- | ||
| Define the cache loaders (i.e., cache stores). Passivation is false because we want *all* | ||
| data to be persisted, not just what doesn't fit into memory. Shared is false because there | ||
| are no other caches sharing this file store. We set preload to false for lazy loading; | ||
| may be improved by preloading and configuring eviction. | ||
| We can have multiple cache loaders, which get chained. But we'll define just one. | ||
| --> | ||
|
|
||
| <loaders passivation="false" shared="false" preload="false"> | ||
|
|
||
| <!-- | ||
| The 'fetchPersistentState' attribute applies when this cache joins the cluster; the value doesn't | ||
| really matter to us in this case. See the documentation for more options. | ||
| --> | ||
| <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true" | ||
| purgeOnStartup="false"> | ||
| <!-- See the documentation for more configuration examples and flags. --> | ||
| <properties> | ||
| <!-- We have to set the location where we want to store the data. --> | ||
| <property name="location" value="${fcrepo.ispn.binary.CacheDirPath:target/FedoraRepositoryBinaryData/storage}"/> | ||
|
|
||
| <property name="fsyncMode" value="perWrite"/> | ||
| </properties> | ||
| <!-- This repository isn't clustered, so we could set up the SingletonStore. | ||
| singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/> | ||
| --> | ||
| <!-- | ||
| We could use "write-behind", which actually writes to the file system asynchronously, | ||
| which can improve performance as seen by the JCR client. | ||
| Plus changes are coalesced, meaning that if multiple changes are enqueued for the | ||
| same node, only the last one is written. (This is good much of the time, but not | ||
| always.) | ||
| <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/> | ||
| --> | ||
| </loader> | ||
| transactionMode="TRANSACTIONAL" | ||
| lockingMode="OPTIMISTIC"/> | ||
|
|
||
| <persistence passivation="false"> | ||
| <singleFile shared="false" | ||
| preload="false" | ||
| fetchPersistentState="false" | ||
| purgeOnStartup="false" | ||
| location="target/fedora_repository/bin_store"> | ||
| </singleFile> | ||
| </persistence> | ||
|
|
||
| </loaders> | ||
| </namedCache> | ||
| </infinispan> |
4 changes: 2 additions & 2 deletions
4
fcrepo-kernel-impl/src/test/resources/config/testing/infinispan-chained.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
fcrepo-kernel-impl/src/test/resources/infinispan_selfhealing_configuration.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters