prometheus-client-mmap 1.0.0-arm64-darwin → 1.0.1-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9df78b71d36cb00132ac5a55bf93413aa83c72f9db5e06e875322b792a5960
-  data.tar.gz: 2154b6fe6a62c76a755f49f35ebd5865f9edc69746cecf1df0ce07b1873ea1aa
+  metadata.gz: c3fe4d8e0bf27904ce318f8cd9db156ff474b1f00bc315f6bf819749614faa64
+  data.tar.gz: 7dc42b1c52ead941cc7d3ee552deb4ce743279371ab80e50836d4d6e09814537
 SHA512:
-  metadata.gz: 929a83c258de11c6ac665854e74cf34f4ea0c7620bccc9cf99f6609c0844948308767291ccdeeae73f5629c413e81efed598de7afe7e93b1316ec2d7ba920e59
-  data.tar.gz: 87255dcf19344b59ac15443fbe4c21fc8ef3578422798384c1250d2fe079778a155cea70e16323f23c7c71094509e2a22dc2325f931cb9b52df93244cd21811f
+  metadata.gz: 13f754bc75e0cf1aca8e8523341b80812cbe2ab9071ea0f6348a66ca285454ab076821a7ee315025ee82fce39de0d3a872d0387359742b0e41c47dfb537a4628
+  data.tar.gz: b7f8a9618453235cd0a9dc995a3740fcc339f0ad9f2e80d0095a3f9d6f394c211065f174b3dc618b81ef004bef32ef6683411f6f776d6fdbd8c417ed923d0cad

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: arm64-darwin
 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