Vladsz83 commented on code in PR #11824:
URL: https://github.com/apache/ignite/pull/11824#discussion_r1954173013
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java:
##########
@@ -1616,37 +1616,35 @@ else if
(!GridFunc.eqNotOrdered(desc.schema().entities(), locQryEntities))
cfg.getNearConfiguration() != null);
}
- updateRegisteredCachesIfNeeded(patchesToApply, cachesToSave,
hasSchemaPatchConflict);
+ if (!hasSchemaPatchConflict)
+ updateRegisteredCaches(patchesToApply, cachesToSave);
}
/**
- * Merging config or resaving it if it needed.
+ * Merging config, resaving it if it needed.
*
* @param patchesToApply Patches which need to apply.
* @param cachesToSave Caches which need to resave.
- * @param hasSchemaPatchConflict {@code true} if we have conflict during
making patch.
- */
- private void updateRegisteredCachesIfNeeded(Map<DynamicCacheDescriptor,
QuerySchemaPatch> patchesToApply,
- Collection<DynamicCacheDescriptor> cachesToSave, boolean
hasSchemaPatchConflict) {
- //Skip merge of config if least one conflict was found.
- if (!hasSchemaPatchConflict) {
- boolean isClusterActive = ctx.state().clusterState().active();
-
- //Merge of config for cluster only for inactive grid.
- if (!isClusterActive && !patchesToApply.isEmpty()) {
- for (Map.Entry<DynamicCacheDescriptor, QuerySchemaPatch> entry
: patchesToApply.entrySet()) {
- if (entry.getKey().applySchemaPatch(entry.getValue()))
- saveCacheConfiguration(entry.getKey());
- }
+ */
+ private void updateRegisteredCaches(
+ Map<DynamicCacheDescriptor, QuerySchemaPatch> patchesToApply,
+ Collection<DynamicCacheDescriptor> cachesToSave
+ ) {
+ // Store config only if cluster is nactive.
+ boolean isClusterActive = ctx.state().clusterState().active();
- for (DynamicCacheDescriptor descriptor : cachesToSave)
- saveCacheConfiguration(descriptor);
- }
- else if (patchesToApply.isEmpty()) {
- for (DynamicCacheDescriptor descriptor : cachesToSave)
- saveCacheConfiguration(descriptor);
+ //Merge of config for cluster only for inactive grid.
+ if (!patchesToApply.isEmpty()) {
+ for (Map.Entry<DynamicCacheDescriptor, QuerySchemaPatch> entry :
patchesToApply.entrySet()) {
+ if (entry.getKey().applySchemaPatch(entry.getValue()) &&
!isClusterActive)
+ saveCacheConfiguration(entry.getKey());
Review Comment:
This is a good question about storing only on active cluster. I'll try to
store every time.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
