libgfapi-ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2cf4e28e5936b345b94a5b64495a3aee76b48e6
-  data.tar.gz: 52d88565ff4b52182ec47e0d7495b4eca46df4ca
+  metadata.gz: 4e77e350dc931b821a46330717902e9dcc53b145
+  data.tar.gz: 2edc86242e04fbc8c33e7b5182f35400f9b27cf0
 SHA512:
-  metadata.gz: 64da0439a3d8bedf46943b3a98dba14ad1b1938a53871f6489f47df036cb711b165a318513689b030ce15bf5eea59aa0e9569c2d9307e1cd3abbca4ce8c432b8
-  data.tar.gz: d85a6a1eea2c1fc5609a17c8217a0f41cb52598284bbde20db89aabbc21d6c49e67be55b96574b20f4a066bd1fff2d12d53df67abccb810d9bbda049dbb2f636
+  metadata.gz: db150aa3a1b1b3019aeba9ec219f74b94015d877ec47e024ff3306045a323050a19f523a24591600f0ef00edec53f842a2672da6f0d7e444ff2d96dfe04e19b0
+  data.tar.gz: dcb362fa8d89b90100015cbd45fdbbc4068b07eb19a0347980a43a6b62deb443d7296304997a69c64fece012a68cd43fd9cd11d67e3c4ca93f937c7f295bf742

data/lib/glusterfs/bindings.rb

@@ -338,6 +338,11 @@ module GlusterFS
 =end
   attach_function :lstat, :glfs_lstat, [:pointer, :string, :pointer], :int
 
+=begin
+  int glfs_fsync (glfs_fd_t *fd) __THROW;
+=end
+  attach_function :fsync, :glfs_fsync, [:pointer], :int
+
 =begin
   glfs_fd_t *glfs_opendir (glfs_t *fs, const char *path) __THROW;
 =end

data/lib/glusterfs/file.rb

@@ -7,7 +7,7 @@ class GlusterFS::File
   end
 
   def read_file(buf_size = 4092)
-    raise GlusterFS::Error, "File is empty or does not exist: #{@path}" if lstat[:st_size] < 1
+    check_exists
     fd = GlusterFS.open(@volume.fs, @path, 0)
     temp = Tempfile.new(path.gsub('/', '-'))
     buff = FFI::MemoryPointer.new(:char, buf_size)
@@ -22,6 +22,7 @@ class GlusterFS::File
   end
 
   def read(buf_size = 4092)
+    check_exists
     fd = GlusterFS.open(@volume.fs, @path, 0)
     temp = ''
     buff = FFI::MemoryPointer.new(:char, buf_size)
@@ -35,9 +36,13 @@ class GlusterFS::File
     temp
   end
 
-  def write_file(file, perms = 0644)
+  def write_file(file, perms = 0644, buffer_size = 4092)
     fd = GlusterFS.creat(@volume.fs, path, 2, perms)
-    res = GlusterFS.write(fd, file.read, file.size, 0)
+    res = 0
+    until file.eof?
+      chunk = file.read(buffer_size)
+      res += GlusterFS.write(fd, chunk, chunk.size , 0)
+    end
     GlusterFS.close(fd)
     res
   end
@@ -67,4 +72,11 @@ class GlusterFS::File
     lstat[:st_size]
   end
 
+  private
+
+  # Reading non-existing file causes segfault on file.read
+  def check_exists
+    raise GlusterFS::Error, "File does not exist: #{@path}" unless exists?
+  end
+
 end

data/lib/glusterfs/version.rb

@@ -1,3 +1,3 @@
 module GlusterFS
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/libgfapi-ruby.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "ruby-mass"
 end

data/spec/glusterfs/file_spec.rb

@@ -48,9 +48,10 @@ module GlusterFS
     end
 
     context '#write_file' do
+      let(:contents) { '12345' * 1024 }
       let(:data) do
         d = Tempfile.new('test')
-        d.write '12345'
+        d.write contents
         d.rewind
         d
       end
@@ -58,7 +59,26 @@ module GlusterFS
 
       context 'writes file' do
         subject { file.write_file(data) }
-        it('returns bytes written') { should == data.length }
+        specify 'consistently' do
+          subject.should == data.length
+          file.read.should == contents
+        end
+      end
+
+      context 'with small buffer' do
+        subject { file.write_file(data, 0644, 16) }
+        specify 'consistently' do
+          subject.should == data.length
+          file.read.should == contents
+        end
+      end
+
+      context 'with huge buffer' do
+        subject { file.write_file(data, 0644, 102400) }
+        specify 'consistently' do
+          subject.should == data.length
+          file.read.should == contents
+        end
       end
 
       context 'overwrites file' do

data/spec/glusterfs/stress/memleak_spec.rb

@@ -1,9 +1,8 @@
 require 'ruby-mass'
 module GlusterFS
 
-  # Set MEM_PRINT=1 MEM_ITERATIONS=10000 to get a stress test
-
   def self.mem_size
+    ObjectSpace.garbage_collect
     _, size = `ps ax -o pid,rss | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
     size.to_i
   end
@@ -22,17 +21,38 @@ module GlusterFS
         puts "RUBY_FREE_MIN=#{ENV['RUBY_FREE_MIN']}"
         puts "Initial memory use: #{GlusterFS.mem_size}"
         Mass.print
+      else
+        puts "Set MEM_PRINT=1 MEM_ITERATIONS=10000 to get a better memory stress test"
       end
     end
 
-    let(:random_blob) do
-      o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
-      (0...15000).map { o[rand(o.length)] }.join
+    let!(:random_blob) do
+      '0' * 1048576 * 5 # 5MB
     end
     let(:volume) { Volume.new(GFS_VOLUME)
                          .mount(GFS_SERVER_HOST, GFS_SERVER_PORT) }
     let(:root_dir) { Directory.new(volume, '/memtest-root') }
 
+    # Mem leak here! Only run when MEM_ITERATIONS is provided.
+    if ENV['MEM_ITERATIONS']
+      context 'mount / unmount volume' do
+        specify do
+          puts "Volume Iterations: #{iterations}"
+          mem_size_before = GlusterFS.mem_size
+          iterations.times do |i|
+            vol = Volume.new(GFS_VOLUME)
+            vol.mount(GFS_SERVER_HOST, GFS_SERVER_PORT)
+            vol.unmount
+            puts i
+          end
+          mem_size = GlusterFS.mem_size
+          puts "Mem growth: #{mem_size - mem_size_before}"
+          Mass.print if ENV['MEM_PRINT']
+          (mem_size - mem_size_before).should be < 10240
+        end
+      end
+    end
+
     context 'create many directories' do
       before { root_dir.create }
       after { root_dir.delete }

data/spec/glusterfs/stress/performance_spec.rb

@@ -0,0 +1,77 @@
+require 'ruby-mass'
+require 'fileutils'
+require 'benchmark'
+module GlusterFS
+
+  describe 'performance' do
+    let(:file_mount_point) { ENV['GFS_MOUNT_DIR'] || '/mnt/dist-volume' }
+    let(:iterations) { (ENV['PERF_ITERATIONS'] || 100).to_i }
+    let!(:random_blob) do
+      '0' * 1048576 * 5 # 5MB
+    end
+
+    specify 'native file system operations' do
+      test_dir ="/tmp/fs-perftest-root"
+      FileUtils.rm_rf test_dir
+      time = Benchmark.realtime do
+        FileUtils.mkdir_p test_dir
+        iterations.times do |i|
+          dir = "#{test_dir}/perf-test-#{i}"
+          FileUtils.mkdir dir
+          file = "#{dir}/file-#{i}"
+          ::File.open(file, 'w+') do |f|
+            f.write(random_blob)
+          end
+          FileUtils.rm(file)
+          FileUtils.rmdir(dir)
+        end
+        FileUtils.rmdir(test_dir)
+      end
+      puts "Native FS Time: #{iterations} iterations: #{'%.4f' % time} sec"
+    end
+
+    specify 'mounted file system operations' do
+      test_dir ="#{file_mount_point}/mnt-perftest-root"
+      FileUtils.rm_rf test_dir
+      time = Benchmark.realtime do
+        FileUtils.mkdir_p test_dir
+        iterations.times do |i|
+          dir = "#{test_dir}/perf-test-#{i}"
+          FileUtils.mkdir dir
+          file = "#{dir}/file-#{i}"
+          ::File.open(file, 'w+') do |f|
+            f.write(random_blob)
+          end
+          FileUtils.rm(file)
+          FileUtils.rmdir(dir)
+        end
+        FileUtils.rmdir(test_dir)
+      end
+      puts "Mounted FS Time: #{iterations} iterations: #{'%.4f' % time} sec"
+    end
+
+    let(:volume) { Volume.new(GFS_VOLUME)
+                         .mount(GFS_SERVER_HOST, GFS_SERVER_PORT) }
+    specify 'api operations' do
+      test_dir ="/gfs-perftest-root"
+      FileUtils.rm_rf "#{file_mount_point}/test_dir"
+      time = Benchmark.realtime do
+        gfs_test_dir = Directory.new(volume, test_dir)
+        gfs_test_dir.create
+        iterations.times do |i|
+          dir = "#{test_dir}/perf-test-#{i}"
+          gfs_dir = Directory.new(volume, dir)
+          gfs_dir.create
+          file = "#{dir}/file-#{i}"
+          gfs_file = File.new(volume, file)
+          gfs_file.write(random_blob)
+          gfs_file.delete
+          gfs_dir.delete
+        end
+        gfs_test_dir.delete
+      end
+      puts "GFS API Time: #{iterations} iterations: #{'%.4f' % time} sec"
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgfapi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomas Varaneckas
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-mass
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,7 @@ files:
 - spec/glusterfs/directory_spec.rb
 - spec/glusterfs/file_spec.rb
 - spec/glusterfs/stress/memleak_spec.rb
+- spec/glusterfs/stress/performance_spec.rb
 - spec/glusterfs/volume_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/spajus/libgfapi-ruby
@@ -135,6 +150,7 @@ test_files:
 - spec/glusterfs/directory_spec.rb
 - spec/glusterfs/file_spec.rb
 - spec/glusterfs/stress/memleak_spec.rb
+- spec/glusterfs/stress/performance_spec.rb
 - spec/glusterfs/volume_spec.rb
 - spec/spec_helper.rb
 has_rdoc: