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
6c21cef9
Commit
6c21cef9
authored
Nov 22, 2013
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use new --connect-timeout for ceph commands
parent
3490c771
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
17 deletions
+5
-17
Ceph.pm
PVE/API2/Ceph.pm
+5
-17
No files found.
PVE/API2/Ceph.pm
View file @
6c21cef9
...
@@ -128,23 +128,11 @@ my $parse_ceph_config = sub {
...
@@ -128,23 +128,11 @@ my $parse_ceph_config = sub {
my
$run_ceph_cmd
=
sub
{
my
$run_ceph_cmd
=
sub
{
my
(
$cmd
,
%
params
)
=
@_
;
my
(
$cmd
,
%
params
)
=
@_
;
my
$timeout
=
3
;
my
$timeout
=
5
;
my
$oldalarm
;
run_command
(['
ceph
',
'
-c
',
$pve_ceph_cfgpath
,
eval
{
'
--connect-timeout
',
$timeout
,
local
$SIG
{
ALRM
}
=
sub
{
die
"
timeout
\n
"
};
@$cmd
],
%
params
);
$oldalarm
=
alarm
(
$timeout
);
# Note: --connect-timeout does not work with current version
# '--connect-timeout', $timeout,
run_command
(['
ceph
',
'
-c
',
$pve_ceph_cfgpath
,
@$cmd
],
%
params
);
alarm
(
0
);
};
my
$err
=
$@
;
alarm
(
$oldalarm
)
if
$oldalarm
;
die
$err
if
$err
;
};
};
my
$run_ceph_cmd_text
=
sub
{
my
$run_ceph_cmd_text
=
sub
{
...
...
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