prometheus-client-mmap 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fc31e7c9aad5a4b25d1d02cc7aa5b44f2a74d05a80776aa6d9f961b51a3631
-  data.tar.gz: '010394948353bb52e8aa4cd12dd45f22d3026099ae05b6d600905872ac094fc2'
+  metadata.gz: d5784085de9d0e4e0effe0b5db0c7182a24063b34624fb9cb5dd17b227698eca
+  data.tar.gz: b4a17ab7a87e683046ad99b2f46c98351f7ecaef4aa8c4936eb50e03a3945e33
 SHA512:
-  metadata.gz: fcd7c42ca842979e64b2e510f18cd9113ace7ab6d68a1f017555defd16940a52aac7a081d86a50654045229f098db2bc53de38e7a47e63edab8ed049b1e32629
-  data.tar.gz: b2f6438a636775e0bf902f244fcd58b0c97fbe3f1f46edf593a5838f0db9c35219de452322cf03b627e2053bbc72b81e2ff98ac7f1f2bbdb20e26c53bdce79df
+  metadata.gz: 8f63328f111585e6ebbb9cc176b95f04f2c1ab030235c8adc175dfa456a14ded16ff2b1390a585a417e538bf53f052e610ba730ced27c480a5dc5939b4dec690
+  data.tar.gz: 8fd38ef21fe05dafa545bf959f1e7d6288fef0ac12537fe8c74242dacbabf7714bb55b12cf13ca3f0b6cb5bd5b85a647100bc726543217611700e48deaeb16ec

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/ext/fast_mmaped_file_rs/src/mmap.rs

@@ -536,14 +536,14 @@ impl MmapedFile {
         match file.seek(SeekFrom::Start(len - 1)) {
             Ok(_) => {}
             Err(_) => {
-                return Err(MmapError::WithErrno(format!("Can't lseek {}", len - 1)));
+                return Err(MmapError::with_errno(format!("Can't lseek {}", len - 1)));
             }
         }
 
         match file.write(&[0x0]) {
             Ok(1) => {}
             _ => {
-                return Err(MmapError::WithErrno(format!(
+                return Err(MmapError::with_errno(format!(
                     "Can't extend {}",
                     path.display()
                 )));

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.2'.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.2
 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-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys