Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectSta… #6765

Closed
wants to merge 3 commits into from
Closed

IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectSta… #6765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c87f2
IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectSta…
Aug 12, 2019
9342394
IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectSta…
Aug 14, 2019
98707c6
IGNITE-12059 DiskPageCompressionConfigValidationTest.testIncorrectSta…
Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
View file
Open in desktop
Expand Up @@ -605,6 +605,7 @@ void initialize(CacheConfiguration cfg, CacheObjectContext cacheObjCtx) throws I
CU.initializeConfigDefaults(log, cfg, cacheObjCtx);

ctx.coordinators().preProcessCacheConfiguration(cfg);
ctx.igfsHelper().preProcessCacheConfiguration(cfg);
}

/**
Expand Down
16 changes: 12 additions & 4 deletions .../src/main/java/org/apache/ignite/internal/processors/cache/ValidationOnNodeJoinUtils.java
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.DeploymentMode;
import org.apache.ignite.configuration.DiskPageCompression;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.MemoryConfiguration;
import org.apache.ignite.configuration.TransactionConfiguration;
Expand Down Expand Up @@ -407,19 +408,26 @@ else if (cc.getRebalanceMode() == SYNC) {
}

if (cc.isEncryptionEnabled() && !ctx.clientNode()) {
StringBuilder cacheSpec = new StringBuilder("[cacheName=").append(cc.getName())
.append(", groupName=").append(cc.getGroupName())
.append(", cacheType=").append(cacheType)
.append(']');

if (!CU.isPersistentCache(cc, c.getDataStorageConfiguration())) {
throw new IgniteCheckedException("Using encryption is not allowed" +
" for not persistent cache [cacheName=" + cc.getName() + ", groupName=" + cc.getGroupName() +
", cacheType=" + cacheType + "]");
" for not persistent cache " + cacheSpec.toString());
}

EncryptionSpi encSpi = c.getEncryptionSpi();

if (encSpi == null) {
throw new IgniteCheckedException("EncryptionSpi should be configured to use encrypted cache " +
"[cacheName=" + cc.getName() + ", groupName=" + cc.getGroupName() +
", cacheType=" + cacheType + "]");
cacheSpec.toString());
}

if (cc.getDiskPageCompression() != DiskPageCompression.DISABLED)
throw new IgniteCheckedException("Encryption cannot be used with disk page compression " +
cacheSpec.toString());
}

Collection<QueryEntity> ents = cc.getQueryEntities();
Expand Down
2 changes: 1 addition & 1 deletion ...he/ignite/internal/processors/cache/persistence/db/IgniteCacheGroupsWithRestartsTest.java
View file
Open in desktop
Expand Up @@ -220,7 +220,7 @@ private void removeCacheDir(String instanceName, String cacheGroup) throws Ignit
/**
* @throws Exception If failed.
*/
@Ignore("https://ggsystems.atlassian.net/browse/GG-21755")
@Ignore("https://issues.apache.org/jira/browse/IGNITE-12072")
@Test
public void testNodeRestartWithNewStaticallyConfiguredCache() throws Exception {
IgniteEx ex = startGrids(3);
Expand Down