Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
93e51239
Commit
93e51239
authored
Mar 06, 2019
by
artix
Browse files
Cluster Manager: add importing/migrating nodes to backup info
parent
c33cb493
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-cli.c
View file @
93e51239
...
@@ -2732,6 +2732,36 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
...
@@ -2732,6 +2732,36 @@ static sds clusterManagerNodeGetJSON(clusterManagerNode *node,
json
=
sdscatprintf
(
json
,
",
\n
\"
cluster_errors
\"
: %lu"
,
json
=
sdscatprintf
(
json
,
",
\n
\"
cluster_errors
\"
: %lu"
,
error_count
);
error_count
);
}
}
if
(
node
->
migrating_count
>
0
&&
node
->
migrating
!=
NULL
)
{
int
i
=
0
;
sds
migrating
=
sdsempty
();
for
(;
i
<
node
->
migrating_count
;
i
+=
2
)
{
sds
slot
=
node
->
migrating
[
i
];
sds
dest
=
node
->
migrating
[
i
+
1
];
if
(
slot
&&
dest
)
{
if
(
sdslen
(
migrating
)
>
0
)
migrating
=
sdscat
(
migrating
,
","
);
migrating
=
sdscatfmt
(
migrating
,
"
\"
%S
\"
:
\"
%S
\"
"
,
slot
,
dest
);
}
}
if
(
sdslen
(
migrating
)
>
0
)
json
=
sdscatfmt
(
json
,
",
\n
\"
migrating
\"
: {%S}"
,
migrating
);
sdsfree
(
migrating
);
}
if
(
node
->
importing_count
>
0
&&
node
->
importing
!=
NULL
)
{
int
i
=
0
;
sds
importing
=
sdsempty
();
for
(;
i
<
node
->
importing_count
;
i
+=
2
)
{
sds
slot
=
node
->
importing
[
i
];
sds
from
=
node
->
importing
[
i
+
1
];
if
(
slot
&&
from
)
{
if
(
sdslen
(
importing
)
>
0
)
importing
=
sdscat
(
importing
,
","
);
importing
=
sdscatfmt
(
importing
,
"
\"
%S
\"
:
\"
%S
\"
"
,
slot
,
from
);
}
}
if
(
sdslen
(
importing
)
>
0
)
json
=
sdscatfmt
(
json
,
",
\n
\"
importing
\"
: {%S}"
,
importing
);
sdsfree
(
importing
);
}
json
=
sdscat
(
json
,
"
\n
}"
);
json
=
sdscat
(
json
,
"
\n
}"
);
sdsfree
(
replicate
);
sdsfree
(
replicate
);
sdsfree
(
slots
);
sdsfree
(
slots
);
...
...
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