#4217 Suppress expected shard write errors

Author: stroomdev66

stroom-cache/stroom-cache-impl/src/main/java/stroom/cache/impl/AbstractStroomCache.java

@@ -26,11 +26,11 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 abstract class AbstractStroomCache<K, V> implements StroomCache<K, V> {
 
@@ -39,6 +39,7 @@ abstract class AbstractStroomCache<K, V> implements StroomCache<K, V> {
     private final String name;
     private final Supplier<CacheConfig> cacheConfigSupplier;
     private final BiConsumer<K, V> removalNotificationConsumer;
+    private final AtomicInteger reachedSizeLimitCount = new AtomicInteger();
 
     protected volatile CacheHolder<K, V> cacheHolder = null;
 
@@ -73,6 +74,7 @@ public AbstractStroomCache(final String name,
      */
     abstract Cache<K, V> createCacheFromBuilder(final Caffeine<K, V> cacheBuilder);
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public synchronized void rebuild() {
         LOGGER.trace(() -> buildMessage("rebuild"));
@@ -143,11 +145,10 @@ private RemovalListener<K, V> createRemovalListener() {
                     cause + ")";
 
             if (cause == RemovalCause.SIZE) {
-                LOGGER.warn(() -> "Cache reached size limit '" + name + "'");
-                LOGGER.debug(messageSupplier);
-            } else {
-                LOGGER.trace(messageSupplier);
+                reachedSizeLimitCount.incrementAndGet();
+                LOGGER.debug(() -> "Cache reached size limit '" + name + "'");
             }
+            LOGGER.trace(messageSupplier);
             removalNotificationConsumer.accept(key, value);
         };
     }
@@ -246,7 +247,7 @@ public void invalidateEntries(final BiPredicate<K, V> entryPredicate) {
                     LOGGER.trace(() -> buildMessage("invalidateEntries", entry.getKey()));
                     return entry.getKey();
                 })
-                .collect(Collectors.toList());
+                .toList();
 
         // Doing the remove on the cacheAsMap means if rebuild was called we are still operating on
         // the old cache
@@ -304,6 +305,9 @@ public CacheInfo getCacheInfo() {
         // We don't make use of Weighers in the cache so the weight stats are meaningless
         map.remove("EvictionWeight");
 
+        // Let users know how many times we have evicted items for hitting the size limit.
+        map.put("Reached Size Limit Count", Integer.toString(reachedSizeLimitCount.get()));
+
         return new CacheInfo(name, basePropertyPath, map);
     }
 
@@ -331,10 +335,10 @@ private void addEntries(final Map<String, String> map, String string) {
                 if (kv.length == 2) {
                     String key = kv[0].replaceAll("\\W", "");
                     String value = kv[1].replaceAll("\\D", "");
-                    if (key.length() > 0) {
+                    if (!key.isEmpty()) {
                         final char[] chars = key.toCharArray();
                         chars[0] = Character.toUpperCase(chars[0]);
-                        key = new String(chars, 0, chars.length);
+                        key = new String(chars);
                     }
 
                     map.put(key, value);

stroom-index/stroom-index-impl/src/main/java/stroom/index/impl/ActiveShardsCacheImpl.java

@@ -191,9 +191,11 @@ private boolean addDocument(final IndexDocument document,
                 LOGGER.trace(e::getMessage, e);
 
             } catch (final RuntimeException e) {
-                LOGGER.error(e::getMessage, e);
                 if (throwException) {
+                    LOGGER.error(e::getMessage, e);
                     throw e;
+                } else {
+                    LOGGER.debug(e::getMessage, e);
                 }
             }
             return false;
@@ -241,7 +243,7 @@ private List<IndexShard> getExistingShards(final IndexShardKey indexShardKey) {
             final List<IndexShard> indexShards = new ArrayList<>();
             final ResultPage<IndexShard> indexShardResultPage = indexShardService.find(criteria);
             for (final IndexShard indexShard : indexShardResultPage.getValues()) {
-                // Look for non deleted, non full, non corrupt index shards.
+                // Look for non deleted, non-full, non-corrupt index shards.
                 if (IndexShardStatus.CLOSED.equals(indexShard.getStatus()) &&
                         indexShard.getDocumentCount() < maxDocsPerShard) {
                     indexShards.add(indexShard);

unreleased_changes/20240416_162118_649__4217.md

@@ -0,0 +1,24 @@
+* Issue **#4217** : Suppress expected shard write errors.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Shard ERROR
+# Issue link:  https://github.com/gchq/stroom/issues/4217
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```