Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
cb030fcd
Commit
cb030fcd
authored
Jan 21, 2014
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ceph: use format 'plain' for call which do no return data
parent
6cf80bbe
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
Ceph.pm
PVE/API2/Ceph.pm
+12
-6
No files found.
PVE/API2/Ceph.pm
View file @
cb030fcd
...
...
@@ -810,7 +810,7 @@ __PACKAGE__->register_method ({
my
$worker
=
sub
{
my
$upid
=
shift
;
$rados
->
mon_command
({
prefix
=>
"
mon remove
",
name
=>
$monid
});
$rados
->
mon_command
({
prefix
=>
"
mon remove
",
name
=>
$monid
,
format
=>
'
plain
'
});
eval
{
&
$ceph_service_cmd
('
stop
',
$monsection
);
};
warn
$@
if
$@
;
...
...
@@ -1055,13 +1055,15 @@ __PACKAGE__->register_method ({
pg_num
=>
int
(
$pg_num
),
# this does not work for unknown reason
# properties => ["size=$size", "min_size=$min_size", "crush_ruleset=$ruleset"],
format
=>
'
plain
',
});
$rados
->
mon_command
({
prefix
=>
"
osd pool set
",
pool
=>
$param
->
{
name
},
var
=>
'
min_size
',
val
=>
$min_size
val
=>
$min_size
,
format
=>
'
plain
',
});
$rados
->
mon_command
({
...
...
@@ -1069,6 +1071,7 @@ __PACKAGE__->register_method ({
pool
=>
$param
->
{
name
},
var
=>
'
size
',
val
=>
$size
,
format
=>
'
plain
',
});
if
(
defined
(
$param
->
{
crush_ruleset
}))
{
...
...
@@ -1077,6 +1080,7 @@ __PACKAGE__->register_method ({
pool
=>
$param
->
{
name
},
var
=>
'
crush_ruleset
',
val
=>
$param
->
{
crush_ruleset
},
format
=>
'
plain
',
});
}
...
...
@@ -1112,7 +1116,9 @@ __PACKAGE__->register_method ({
prefix
=>
"
osd pool delete
",
pool
=>
$param
->
{
name
},
pool2
=>
$param
->
{
name
},
sure
=>
'
--yes-i-really-really-mean-it
'});
sure
=>
'
--yes-i-really-really-mean-it
',
format
=>
'
plain
',
});
return
undef
;
}});
...
...
@@ -1356,13 +1362,13 @@ __PACKAGE__->register_method ({
warn
$@
if
$@
;
print
"
Remove
$osdsection
from the CRUSH map
\n
";
$rados
->
mon_command
({
prefix
=>
"
osd crush remove
",
name
=>
$osdsection
});
$rados
->
mon_command
({
prefix
=>
"
osd crush remove
",
name
=>
$osdsection
,
format
=>
'
plain
'
});
print
"
Remove the
$osdsection
authentication key.
\n
";
$rados
->
mon_command
({
prefix
=>
"
auth del
",
entity
=>
$osdsection
});
$rados
->
mon_command
({
prefix
=>
"
auth del
",
entity
=>
$osdsection
,
format
=>
'
plain
'
});
print
"
Remove OSD
$osdsection
\n
";
$rados
->
mon_command
({
prefix
=>
"
osd rm
",
ids
=>
"
$osdid
"
});
$rados
->
mon_command
({
prefix
=>
"
osd rm
",
ids
=>
"
$osdid
"
,
format
=>
'
plain
'
});
# try to unmount from standard mount point
my
$mountpoint
=
"
/var/lib/ceph/osd/ceph-
$osdid
";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment