Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add timeout to ceph_pool resource #225

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add timeout to ceph_pool resource #225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3f2c48
Add timeout to ceph_pool resource
Johanni May 26, 2016
0c5cc19
Add timeout to ceph_pool resource
Johanni May 26, 2016
73f3355
Fix rubocop deprecated conf
guilhem Jun 2, 2016
c2211d2
Add timeout to ceph_pool resource
Johanni May 26, 2016
da9b68a
Add timeout to ceph_pool resource
Johanni May 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def load_current_resource
def create_pool
cmd_text = "ceph osd pool create #{new_resource.name} #{new_resource.pg_num}"
cmd_text << " #{new_resource.create_options}" if new_resource.create_options
cmd = Mixlib::ShellOut.new(cmd_text)
cmd = Mixlib::ShellOut.new(cmd_text, :timeout => new_resource.timeout)
cmd.run_command
cmd.error!
Chef::Log.debug "Pool created: #{cmd.stderr}"
Expand Down
3 changes: 3 additions & 0 deletions resources/pool.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
# Optional arguments for pool creation
attribute :create_options, :kind_of => String

# The number of seconds before a timeout occurs during pool creation
attribute :timeout, :kind_of => Integer, :default => nil, :required => false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:default => nil, :required => false are optional as it's the default behavior


# Forces a non-empty pool to be deleted.
attribute :force, :kind_of => [TrueClass, FalseClass], :default => false

Expand Down