#5130 Fix raw size meta bug

Author: stroomdev66

stroom-data/stroom-data-store-impl-fs/src/main/java/stroom/data/store/impl/fs/FsTarget.java

@@ -169,33 +169,36 @@ public void close() {
             throw new DataException("Target already closed");
         }
 
-        if (!deleted) {
-            // If we get error on closing the stream we must return it to the caller
-            RuntimeException streamCloseException = null;
-            try {
-                closeStreams();
-            } catch (final RuntimeException e) {
-                streamCloseException = e;
-            }
-
-            // Only write meta for the root target.
-            if (parent == null) {
-                // Update attributes and write the manifest.
-                updateAttribute(this, MetaFields.RAW_SIZE, String.valueOf(getStreamSize()));
-                updateAttribute(this, MetaFields.FILE_SIZE, String.valueOf(getTotalFileSize()));
-                writeManifest();
-
-                if (streamCloseException == null) {
-                    // Unlock will update the meta data so set it back on the stream
-                    // target so the client has the up to date copy
-                    unlock(getMeta(), getAttributes());
-                } else {
-                    throw streamCloseException;
+        try {
+            if (!deleted) {
+                // If we get error on closing the stream we must return it to the caller
+                RuntimeException streamCloseException = null;
+                try {
+                    closeStreams();
+                } catch (final RuntimeException e) {
+                    streamCloseException = e;
+                } finally {
+                    // Only write meta for the root target.
+                    if (parent == null) {
+                        // Update attributes and write the manifest.
+                        updateAttribute(this, MetaFields.RAW_SIZE, String.valueOf(getStreamSize()));
+                        updateAttribute(this, MetaFields.FILE_SIZE, String.valueOf(getTotalFileSize()));
+                        writeManifest();
+
+                        if (streamCloseException == null) {
+                            // Unlock will update the meta data so set it back on the stream
+                            // target so the client has the up to date copy
+                            unlock(getMeta(), getAttributes());
+                        } else {
+                            throw streamCloseException;
+                        }
+                    }
                 }
             }
+        } finally {
+            outputStream = null;
+            closed = true;
         }
-
-        closed = true;
     }
 
     private void unlock(final Meta meta, final AttributeMap attributeMap) {
@@ -225,16 +228,20 @@ public void delete() {
             // Close the stream target.
             closeStreams();
         } finally {
-            // Only delete the root target.
-            if (parent == null) {
-                // Mark the target meta as deleted.
-                this.meta = metaService.updateStatus(meta, Status.LOCKED, Status.DELETED);
+            try {
+                // Only delete the root target.
+                if (parent == null) {
+                    // Mark the target meta as deleted.
+                    this.meta = metaService.updateStatus(meta, Status.LOCKED, Status.DELETED);
+                }
+            } finally {
+                outputStream = null;
+                deleted = true;
             }
-            deleted = true;
         }
     }
 
-    private synchronized void closeStreams() {
+    private void closeStreams() {
         RuntimeException exception = null;
 
         // Close the stream target.
@@ -244,8 +251,6 @@ private synchronized void closeStreams() {
             } catch (final IOException e) {
                 LOGGER.error(() -> "closeStreams() - Error on closing stream " + this, e);
                 exception = new UncheckedIOException(e);
-            } finally {
-                outputStream = null;
             }
         }
 

unreleased_changes/20250919_091417_259__5130.md

@@ -0,0 +1,60 @@
+* Issue **#5130** : Fix raw size meta bug.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Raw size is set to `0.0B`
+# Issue link:  https://github.com/gchq/stroom/issues/5130
+# ********************************************************************************
+
+# 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.
+
+
+# --------------------------------------------------------------------------------
+# The following is random text to make this file unique for git's change detection
+# h2vcQ03HLlVScRnKfkAZsVWHjAhY9zC3vgWBz90p6noMJvH5kr0INmixHWDrh3TC46qVaFxRwluXVz5Z
+# 7oP4PJLsax7HX1vqDeZhQeFxxpwcHh8AFjdbDinHZrHCDA1Msh6vBUb25cDmI6VCTDRJGLLgTY9JUh4o
+# 47v5KtVfBrRxIcaJaKy3dDhzxbi527LmFxkTxHweyuHfKkJ0aBuKBBAfZhkpX9Y5VXQ8rc40sI5HgFhS
+# g8KAaBmzNBjU2TZx8n4f3cUyXKHijd0xcg0bzbx6Da1G0cfwSebNYIs1l0m947l6wyNiK0HrIPe5ibAZ
+# osKxLnoezBGBnKoLe9nGm8MSU7iR8XrMRGZ2bCmrCpyVDRWL7sgUCZNNCAPgPBJz4kQzqU3GtVyCN25t
+# QlJ82SGjM74QcwFs9xNbG0S24VH1Sq5R24pO1dTaq8vnH0yKVYZ3cS1ZoXWefs30q6Cj8c6mX0soPmN7
+# UNdwBuBh3dR6YCD3rKF10pGokcxQoBLTPLIREXar2TAvAJL0bfxV1NV79TEAUh1jbfm406k45CPlcXtM
+# eb9VpNACVCs42CoylQc7h7zSrH85jtgCrYVDpGdgsx4VFiidsMPiqabifg9YdZPmQTUeQfS1A3WwwNUH
+# KfvRmPvhRSh3ugSAreFCqfEhCH9jrNJKnTCKybdcnUzrFpFwZTRzsOY5F9OE3CXiKVTva310H5OmEFOQ
+# oPHfwiH24ZkmssIEoUZXmLmTiz9e8SWPj7RjlnLR0fGfEecCoXAYLPXnPhHLoDpYouNmsJYYWx4yg3eR
+# SmKSYkOMMma0gK9Np9xfheVmMhkJ75SypBVesZcaCwxMrB53PfyaraFrdsqrtrnPEC1jpVAtXKF3jy3R
+# 9xGANnN39p5NApS4YeGFE2lkIXJUaoxiM9hKB6qKGIypjMFPxWwAn2la9CjFLDYSzf6GoYeAWxczVdsM
+# kl5ydZiqOKBQt23ceC4Ssur72BWyi9NKRTMzp3qlHLZZd4Wn45qUWsvtelDoFdbfXBr8509sb0iGHuJh
+# mEUoAms0079r9NHcl15blcxLpmWFO3doqwDqQ1Bih2Ql0BatW4LUDo8slulcqV0na4RLMwKs4XwIsLdc
+# aHymFCREEEl0UDpug3yYiyyE6zHgqovtblr10cKwZ9g6BkwD4WW028vFhuOW3wpLA08RuWczALaYaygV
+# 5Oi9IQhMtuL92DRqqhfKI227OySraiRIAGChvfbSThi50o4OC0lmKsdJDfFrptdColgKJ4yeDKm4cYk9
+# qymcx6WPP7srrnrpVisVCku8Ml8IP4LhiQv4SdTNENjvxAMcHAzCraZndxNcWcWGsnr33f1CPk9MHrbb
+# sWaotLHpUbvxTtQxU5f3BiOgx5UL9ug6nmW29zreCZeory7LlYi5LwdcpbPGGlcKAOkKxI43xLhR8urG
+# HKClzEH48THamzdy1owoJxSNtumuAuO3RhvWVY1cVEVxgIlmZFfgtTSgBYzTRDdVvDxEUKUrdfkkwbwu
+# 92TgxYhahKxxkzbCBLAt0o2Qsp1qTgJii6bzgJHj8E1QptXphoYv4wf8N6hIhWQ5TQNE9A5EfwqWaKEm
+# GHkVkzCwJ0Fttr1C5mGKa19bXwVro2SlxtinBke2dbfqsTEPFf3KOCgaYWBJ14jjoQrJ9Xgwi8M3C5QP
+# S5jmStRPQxvJLM7BZMQdj29FWJwxv3UwG8k5yQEETQJPBvkUsjRUubKJRdwWu0LqJmC9yvuNRxIcO7fR
+# BHeQOFc7P5pLa7QAkwv9eRGWlWkgL0jWZFQs85FhTPnQgfcktNuJLkHYaXwbl8VcGY2ZbUFXJQU76KaJ
+# pFFSlM56YPVfG7DRul6Cq63iToQYHT8RZ0bLUfEUJm5YoCOIQkLo2eN4jj0CVZZ22BYh25l9WfmPAckk
+# 5mGiDfZrWRIG1xPKbN1Jp5PBDw6Jh2MyYifo4kU7k1vyZ8Z7IEwfVqBZ9xa8MMUBs8QKsMkzg3lCv4El
+# CnffwMZK5WPRhAJgok9cvYDam0mB6dP5ToV70qgrJ7XBgyshYOxTLzehdLJe6DNii5rhiOqGT2BHTpo2
+# Ee3EYTsFTcoIyw20nZKGnaSu06LwMf28KVxSxja51yRPHMPSa335jFgQWRbGG1SK3Nn1HU4bEYwS4dK4
+# g5BwwTTgoqXan7OolydUbKFIFLiv4cbpt4hGqni3BEvGNDglZGB8vexAQibfb5lPPmPtVQJhwygWjdTn
+# SM4fTL2ax6AtKGjsgcWimg2xhv5rP1QkTDMQ5JIsG1bqXrs7s2ZqZpxbziYbTh2U2z5L3hNKhTWQ39rD
+# G3K1YH0hcmL4nGkBUTkr1S7AJMKRuhuZaMGqD07pWe4nFvq0GptMgEbomv5ig05FkTerxOsZYY0lfVqH
+# --------------------------------------------------------------------------------
+
+```