prometheus-client-mmap 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fc31e7c9aad5a4b25d1d02cc7aa5b44f2a74d05a80776aa6d9f961b51a3631
-  data.tar.gz: '010394948353bb52e8aa4cd12dd45f22d3026099ae05b6d600905872ac094fc2'
+  metadata.gz: 6459f7a4e1be70f9d2d1349cfd9c738c944e091617e4f11bceed5a7892afcb9b
+  data.tar.gz: 228a7354d5125340f59ec6de572b59a73ca741450719a74561f001f9ff95dbd7
 SHA512:
-  metadata.gz: fcd7c42ca842979e64b2e510f18cd9113ace7ab6d68a1f017555defd16940a52aac7a081d86a50654045229f098db2bc53de38e7a47e63edab8ed049b1e32629
-  data.tar.gz: b2f6438a636775e0bf902f244fcd58b0c97fbe3f1f46edf593a5838f0db9c35219de452322cf03b627e2053bbc72b81e2ff98ac7f1f2bbdb20e26c53bdce79df
+  metadata.gz: 3f5fafe6f89b21da09e1a1aa105857587c8c4ddf68122b4263effac73dfe4f36897e0f5376ee5cf9088ecbe654f8a4bf24b336fd4b6d91235ffb8c2390b2cbc8
+  data.tar.gz: c5a7ad4e2750cec2cc9f5bad880dfe0479d348d29edce1a9d9aba582b8003a97edf550bf0e70bf3499a498b78890125537ce43c8c24e6730010e8f0b5856d4fb

data/ext/fast_mmaped_file_rs/src/file_info.rs

@@ -91,6 +91,11 @@ impl FileInfo {
 
         match self.file.read_to_end(buf) {
             Ok(n) if n == self.len => Ok(()),
+            // A worker may expand the file between our `stat` and `read`, no harm done.
+            Ok(n) if n > self.len => {
+                self.len = n;
+                Ok(())
+            }
             Ok(_) => Err(MmapError::io(
                 "read",
                 &self.path,
@@ -106,6 +111,8 @@ mod test {
     use magnus::{eval, RArray, Symbol};
     use rand::{thread_rng, Rng};
     use sha2::{Digest, Sha256};
+    use std::fs;
+    use std::io::Write;
 
     use super::*;
     use crate::testhelper::TestFile;
@@ -165,7 +172,7 @@ mod test {
 
         let mut info = FileInfo {
             file,
-            path,
+            path: path.clone(),
             len: buf.len(),
             multiprocess_mode: Symbol::new("puma"),
             type_: Symbol::new("max"),
@@ -187,4 +194,47 @@ mod test {
 
         assert_eq!(in_hash, out_hash, "content hashes");
     }
+
+    #[test]
+    fn test_read_from_file_resized() {
+        let _cleanup = unsafe { magnus::embed::init() };
+        let ruby = magnus::Ruby::get().unwrap();
+        crate::init(&ruby).unwrap();
+
+        const BUF_LEN: usize = 1 << 14; // 16KiB
+
+        // Create a buffer with random data.
+        let mut buf = vec![0u8; BUF_LEN];
+        thread_rng().fill(buf.as_mut_slice());
+
+        let TestFile {
+            file,
+            path,
+            dir: _dir,
+        } = TestFile::new(&buf);
+
+        let mut info = FileInfo {
+            file,
+            path: path.clone(),
+            len: buf.len(),
+            multiprocess_mode: Symbol::new("puma"),
+            type_: Symbol::new("max"),
+            pid: "worker-0_0".to_string(),
+        };
+
+        let mut resized_file = fs::OpenOptions::new()
+            .write(true)
+            .append(true)
+            .open(path)
+            .unwrap();
+
+        // Write data to file after it has been `stat`ed in the
+        // constructor.
+        resized_file.write_all(&[1; 1024]).unwrap();
+
+        let mut out_buf = Vec::new();
+        info.read_from_file(&mut out_buf).unwrap();
+
+        assert_eq!(BUF_LEN + 1024, info.len, "resized file updated len");
+    }
 }

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys