libgfapi-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc23e8e61cab7ae1e59207844201a7f1d3e61919
-  data.tar.gz: a06dd442af33340a906cac88244668b90554b585
+  metadata.gz: f2cf4e28e5936b345b94a5b64495a3aee76b48e6
+  data.tar.gz: 52d88565ff4b52182ec47e0d7495b4eca46df4ca
 SHA512:
-  metadata.gz: 4483213f2ef51f6c96c225e04f6b794da819a275332e91edc8f06510ed50a18e4f3740985d3e03221369e512e2794ec400b29114d34f7c2a3e165a023f4c245e
-  data.tar.gz: ef0c69e51653edd3075105aa89e5a87d1da6d45401fad0d2330a0a1966400371d9330ce587920dc572c7b7f19cfb3897740daae06368b5faefedd8f4ad7443dc
+  metadata.gz: 64da0439a3d8bedf46943b3a98dba14ad1b1938a53871f6489f47df036cb711b165a318513689b030ce15bf5eea59aa0e9569c2d9307e1cd3abbca4ce8c432b8
+  data.tar.gz: d85a6a1eea2c1fc5609a17c8217a0f41cb52598284bbde20db89aabbc21d6c49e67be55b96574b20f4a066bd1fff2d12d53df67abccb810d9bbda049dbb2f636

data/README.md

@@ -5,7 +5,7 @@ Ruby bindings for [libgfapi](https://github.com/gluster/glusterfs/blob/master/ap
 
 ## Warning
 
-This library is currently under active development, and is not ready for production yet.
+This library is currently under active development, and API may break often.
 
 ## Installation
 
@@ -37,6 +37,8 @@ dir.create
 # Delete a directory
 dir = GlusterDS::Directory.new(volume, '/some_dir')
 dir.delete
+# or
+volume.delete_dir('/some_dir')
 
 # Create a file from string or bytes
 file = GlusterFS::File.new(volume, '/gfs/file/path')
@@ -60,7 +62,9 @@ puts "Tempfile path: #{tempfile.path}"
 
 # Delete a file
 file = GlusterFS::File.new(volume, '/gfs/file/path')
-file.unlink
+file.delete
+# or
+volume.delete_file('/gfs/file/path')
 
 # Unmount virtual mount
 volume.unmount
@@ -85,6 +89,11 @@ export GFS_SERVER_PORT=24007
 rake spec
 ```
 
+## TODO
+
+Major things missing:
+- Directory listing
+
 ## Contributing
 
 1. Fork it ( http://github.com/spajus/libgfapi-ruby/fork )

data/lib/glusterfs/bindings.rb

@@ -338,6 +338,28 @@ module GlusterFS
 =end
   attach_function :lstat, :glfs_lstat, [:pointer, :string, :pointer], :int
 
+=begin
+  glfs_fd_t *glfs_opendir (glfs_t *fs, const char *path) __THROW;
+=end
+  attach_function :opendir, :glfs_opendir, [:pointer, :string], :pointer
+
+=begin
+  int glfs_closedir (glfs_fd_t *fd) __THROW;
+=end
+  attach_function :closedir, :glfs_closedir, [:pointer], :int
+
+=begin
+  @glfs_readdir_r and @glfs_readdirplus_r ARE thread safe AND re-entrant,
+  but the interface has ambiguity about the size of @dirent to be allocated
+  before calling the APIs. 512 byte buffer (for @dirent) is sufficient for
+  all known systems which are tested againt glusterfs/gfapi, but may be
+  insufficient in the future.
+
+  int glfs_readdir_r (glfs_fd_t *fd, struct dirent *dirent,
+                      struct dirent **result) __THROW;
+=end
+  attach_function :readdir_r, :glfs_readdir_r, [:pointer, :pointer, :pointer], :int
+
   # TODO the rest
 
 end

data/lib/glusterfs/dirent.rb

@@ -0,0 +1,7 @@
+class GlusterFS::Dirent < FFI::Struct
+  layout :d_ino,       :ino_t,
+         :d_off,       :ulong,
+         :d_reclen,    :ushort,
+         :d_type,      :char,
+         :d_name,      :string
+end

data/lib/glusterfs/version.rb

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

data/lib/glusterfs/volume.rb

@@ -1,5 +1,5 @@
 class GlusterFS::Volume
-  attr_reader :name, :fs, :mounted
+  attr_reader :name, :fs, :mounted, :protocol, :host, :port
 
   def initialize(name)
     @name = name
@@ -8,16 +8,39 @@ class GlusterFS::Volume
   end
 
   def mount(host, port = 24007, protocol = 'tcp')
+    raise GlusterFS::Error, "Already mounted: #{self}" if mounted?
     GlusterFS.set_volfile_server(@fs, protocol, host, port)
     result = GlusterFS.init(@fs)
-    if result != 0
-      raise GlusterFS::Error,
-        "Failed to mount volume '#{volume_name}' on #{protocol}://#{host}:#{port}"
-    end
+    raise GlusterFS::Error, "Failed to mount volume #{self}" if result != 0
     @mounted = true
+    @host = host
+    @protocol = protocol
+    @port = port
     self
   end
 
+  def lstat(path)
+    check_mounted
+    data = GlusterFS::Stat.new
+    GlusterFS.lstat(@fs, path, data)
+    data
+  end
+
+  def list(path)
+    dir = Directory.new(volume, path)
+    dir.list
+  end
+
+  def delete_file(path)
+    check_mounted
+    GlusterFS.unlink(@fs, path)
+  end
+
+  def delete_dir(path)
+    check_mounted
+    GlusterFS.rmdir(@fs, path)
+  end
+
   def mounted?
     @mounted
   end
@@ -29,4 +52,18 @@ class GlusterFS::Volume
       true
     end
   end
+
+  private
+
+  def to_s
+    if mounted?
+      "GlusterFS::Volume['#{@name}' on #{protocol}://#{host}:#{port}]"
+    else
+      "GlusterFS::Volume['#{@name}' (unmounted)]"
+    end
+  end
+
+  def check_mounted
+    raise GlusterFS::Error, "Volume not mounted: #{self}" unless mounted?
+  end
 end

data/lib/glusterfs.rb

@@ -1,11 +1,12 @@
 require "ffi"
 require "glusterfs/version"
+require "glusterfs/dirent"
+require "glusterfs/stat"
 require "glusterfs/bindings"
 require "glusterfs/error"
 require "glusterfs/file"
 require "glusterfs/directory"
 require "glusterfs/volume"
-require "glusterfs/stat"
 
 module GlusterFS
 end

data/spec/glusterfs/{memleak_spec.rb → stress/memleak_spec.rb}

@@ -1,26 +1,28 @@
 require 'ruby-mass'
 module GlusterFS
 
+  # Set MEM_PRINT=1 MEM_ITERATIONS=10000 to get a stress test
+
   def self.mem_size
-    # ObjectSpace.garbage_collect
-    # sleep 3
     _, size = `ps ax -o pid,rss | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
     size.to_i
   end
 
   describe 'memleaks' do
 
-    let(:iterations) { 10000 }
+    let(:iterations) { (ENV['MEM_ITERATIONS'] || 100).to_i }
 
     before(:all) do
-      puts "GC Settings"
-      puts "RUBY_HEAP_MIN_SLOTS=#{ENV['RUBY_HEAP_MIN_SLOTS']}"
-      puts "RUBY_HEAP_SLOTS_INCREMENT=#{ENV['RUBY_HEAP_SLOTS_INCREMENT']}"
-      puts "RUBY_HEAP_SLOTS_GROWTH_FACTOR=#{ENV['RUBY_HEAP_SLOTS_GROWTH_FACTOR']}"
-      puts "RUBY_GC_MALLOC_LIMIT=#{ENV['RUBY_GC_MALLOC_LIMIT']}"
-      puts "RUBY_FREE_MIN=#{ENV['RUBY_FREE_MIN']}"
-      puts "Initial memory use: #{GlusterFS.mem_size}"
-      Mass.print
+      if ENV['MEM_PRINT']
+        puts "GC Settings"
+        puts "RUBY_HEAP_MIN_SLOTS=#{ENV['RUBY_HEAP_MIN_SLOTS']}"
+        puts "RUBY_HEAP_SLOTS_INCREMENT=#{ENV['RUBY_HEAP_SLOTS_INCREMENT']}"
+        puts "RUBY_HEAP_SLOTS_GROWTH_FACTOR=#{ENV['RUBY_HEAP_SLOTS_GROWTH_FACTOR']}"
+        puts "RUBY_GC_MALLOC_LIMIT=#{ENV['RUBY_GC_MALLOC_LIMIT']}"
+        puts "RUBY_FREE_MIN=#{ENV['RUBY_FREE_MIN']}"
+        puts "Initial memory use: #{GlusterFS.mem_size}"
+        Mass.print
+      end
     end
 
     let(:random_blob) do
@@ -35,7 +37,7 @@ module GlusterFS
       before { root_dir.create }
       after { root_dir.delete }
       specify do
-        puts "Iterations: #{iterations}"
+        puts "Dir Iterations: #{iterations}"
         mem_size_before = GlusterFS.mem_size
         iterations.times do |i|
           dir = Directory.new(volume, "#{root_dir.path}/subdir-#{i}")
@@ -44,7 +46,7 @@ module GlusterFS
         end
         mem_size = GlusterFS.mem_size
         puts "Mem growth: #{mem_size - mem_size_before}"
-        Mass.print
+        Mass.print if ENV['MEM_PRINT']
         (mem_size - mem_size_before).should be < 10240
       end
     end
@@ -53,7 +55,7 @@ module GlusterFS
       before { root_dir.create }
       after { root_dir.delete }
       specify do
-        puts "Iterations: #{iterations}"
+        puts "File Iterations: #{iterations}"
         mem_size_before = GlusterFS.mem_size
         iterations.times do |i|
           file = File.new(volume, "#{root_dir.path}/file-#{i}")
@@ -62,7 +64,7 @@ module GlusterFS
         end
         mem_size = GlusterFS.mem_size
         puts "Mem growth: #{mem_size - mem_size_before}"
-        Mass.print
+        Mass.print if ENV['MEM_PRINT']
         (mem_size - mem_size_before).should be < 10240
       end
     end

data/spec/glusterfs/volume_spec.rb

@@ -4,6 +4,8 @@ module GlusterFS
   describe Volume do
     let(:volume) { Volume.new(GFS_VOLUME) }
 
+    after(:each) { volume.unmount if volume.mounted? }
+
     context '#mount' do
       before { volume.mount(GFS_SERVER_HOST, GFS_SERVER_PORT) }
       subject { volume.mounted? }
@@ -19,7 +21,64 @@ module GlusterFS
       it { should_not be_true }
     end
 
+    context '#lstat' do
+      context 'on file' do
+        let(:file_name) { "test-stat-#{Time.now.to_i}" }
+        let(:file) { File.new(volume, file_name) }
+        let(:data) { '123' }
+        before do
+          volume.mount(GFS_SERVER_HOST, GFS_SERVER_PORT)
+          file.write(data)
+        end
+        after { file.delete }
+        subject { volume.lstat(file.path) }
+        its([:st_size]) { should == file.size }
+      end
+
+      context 'on directory' do
+        let(:dir_name) { "test-#{Time.now.to_i}" }
+        let(:dir) { Directory.new(volume, dir_name) }
+        before do
+          volume.mount(GFS_SERVER_HOST, GFS_SERVER_PORT)
+          dir.create
+        end
+        after { dir.delete }
+        subject { volume.lstat(dir.path) }
+        its([:st_blksize]) { should == dir.lstat[:st_blksize] }
+      end
+
+      specify 'raise error when unmounted' do
+        expect { volume.lstat('/foo/bar') }.to raise_error(GlusterFS::Error)
+      end
+    end
+
+    context '#delete_dir' do
+      let(:dir_name) { "test-#{Time.now.to_i}" }
+      let(:dir) { Directory.new(volume, dir_name) }
+      before do
+        volume.mount(GFS_SERVER_HOST, GFS_SERVER_PORT)
+        dir.create
+      end
+      before { volume.delete_dir(dir.path) }
+      subject { dir.exists? }
+      it { should_not be_true }
+    end
+
+    context '#delete_file' do
+      let(:file_name) { "test-stat-#{Time.now.to_i}" }
+      let(:file) { File.new(volume, file_name) }
+      let(:data) { '123' }
+      before do
+        volume.mount(GFS_SERVER_HOST, GFS_SERVER_PORT)
+        file.write(data)
+      end
+      before { volume.delete_file(file.path) }
+      subject { file.exists? }
+      it { should_not be_true }
+    end
+
     context '#mounted?' do
+      before { volume.unmount }
       subject { volume.mounted? }
 
       context 'on mounted volume' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgfapi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomas Varaneckas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -95,6 +95,7 @@ files:
 - lib/glusterfs.rb
 - lib/glusterfs/bindings.rb
 - lib/glusterfs/directory.rb
+- lib/glusterfs/dirent.rb
 - lib/glusterfs/error.rb
 - lib/glusterfs/file.rb
 - lib/glusterfs/stat.rb
@@ -103,7 +104,7 @@ files:
 - libgfapi-ruby.gemspec
 - spec/glusterfs/directory_spec.rb
 - spec/glusterfs/file_spec.rb
-- spec/glusterfs/memleak_spec.rb
+- spec/glusterfs/stress/memleak_spec.rb
 - spec/glusterfs/volume_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/spajus/libgfapi-ruby
@@ -133,7 +134,7 @@ summary: Ruby bindings for libgfapi (GlusterFS API)
 test_files:
 - spec/glusterfs/directory_spec.rb
 - spec/glusterfs/file_spec.rb
-- spec/glusterfs/memleak_spec.rb
+- spec/glusterfs/stress/memleak_spec.rb
 - spec/glusterfs/volume_spec.rb
 - spec/spec_helper.rb
 has_rdoc: