Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
f67b0d0e
Commit
f67b0d0e
authored
7 years ago
by
Kyle Havlovitz
Browse files
Options
Download
Email Patches
Plain Diff
Add missing exist checks and doc line
parent
9b206ee9
Branches unavailable
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc.1
v1.4.0-beta.1
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc.1
v1.3.0-beta.1
v1.2.15
v1.2.14
v1.2.13
v1.2.12
v1.2.11
v1.2.10
v1.2.9
v1.2.8
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc1
v1.2.0-beta1
v1.1.18
v1.1.17
v1.1.16
v1.1.15
v1.1.14
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-rc1
v1.1.0-beta1
v1.0.18
v1.0.17
v1.0.16
v1.0.15
v1.0.14
v1.0.13
v1.0.12
v1.0.11
v1.0.10
v1.0.9
v1.0.8
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1.0.0-rc1
v1.0.0-beta3
v1.0.0-beta2
v0.12.12
v0.12.11
v0.12.10
v0.12.9
v0.12.8
v0.12.7
v0.12.6
v0.12.5
v0.12.4
v0.12.4-rc1
v0.12.3
v0.12.2
v0.12.1
v0.12.0
v0.12.0-rc1
v0.12.0-beta2
v0.12.0-beta1
v0.11.8
v0.11.7
v0.11.6
v0.11.5
v0.11.4
v0.11.3
v0.11.2
v0.11.1
v0.11.0
v0.11.0-rc1
v0.11.0-beta2
v0.11.0-beta1
v0.10.9
v0.10.8
v0.10.7
v0.10.6
v0.10.5
v0.10.4
v0.10.4-rc1
v0.10.3
v0.10.2
v0.10.2-rc1
v0.10.1
v0.10.0
v0.10.0-rc1
v0.10.0-connect1
v0.10.0-beta1
v0.9.7
v0.9.6
v0.9.5
v0.9.4
v0.9.4-rc1
v0.9.3
v0.9.2
v0.9.2-rc1
v0.9.1
v0.9.1-rc1
v0.9.0
v0.9.0-rc2
v0.9.0-rc1
v0.9.0-beta3
v0.9.0-beta2
v0.9.0-beta1
v0.8.7
v0.8.7-rc1
v0.8.6
v0.8.5
v0.8.4
v0.8.4-rc1
v0.8.3
v0.8.2
v0.8.1
v0.8.0
v0.8.0-rc1
nightly
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
nomad/operator_endpoint.go
+8
-6
nomad/operator_endpoint.go
nomad/util.go
+4
-1
nomad/util.go
website/source/api/operator.html.md
+1
-0
website/source/api/operator.html.md
with
13 additions
and
7 deletions
+13
-7
nomad/operator_endpoint.go
+
8
-
6
View file @
f67b0d0e
...
...
@@ -54,15 +54,17 @@ func (op *Operator) RaftGetConfiguration(args *structs.GenericRequest, reply *st
raftProtocolVersion
:=
"unknown"
if
member
,
ok
:=
serverMap
[
server
.
Address
];
ok
{
node
=
member
.
Name
raftProtocolVersion
=
member
.
Tags
[
"raft_vsn"
]
if
raftVsn
,
ok
:=
member
.
Tags
[
"raft_vsn"
];
ok
{
raftProtocolVersion
=
raftVsn
}
}
entry
:=
&
structs
.
RaftServer
{
ID
:
server
.
ID
,
Node
:
node
,
Address
:
server
.
Address
,
Leader
:
server
.
Address
==
leader
,
Voter
:
server
.
Suffrage
==
raft
.
Voter
,
ID
:
server
.
ID
,
Node
:
node
,
Address
:
server
.
Address
,
Leader
:
server
.
Address
==
leader
,
Voter
:
server
.
Suffrage
==
raft
.
Voter
,
RaftProtocol
:
raftProtocolVersion
,
}
reply
.
Servers
=
append
(
reply
.
Servers
,
entry
)
...
...
This diff is collapsed.
Click to expand it.
nomad/util.go
+
4
-
1
View file @
f67b0d0e
...
...
@@ -62,7 +62,10 @@ func isNomadServer(m serf.Member) (bool, *serverParts) {
return
false
,
nil
}
id
:=
m
.
Tags
[
"id"
]
id
:=
"unknown"
if
v
,
ok
:=
m
.
Tags
[
"id"
];
ok
{
id
=
v
}
region
:=
m
.
Tags
[
"region"
]
datacenter
:=
m
.
Tags
[
"dc"
]
_
,
bootstrap
:=
m
.
Tags
[
"bootstrap"
]
...
...
This diff is collapsed.
Click to expand it.
website/source/api/operator.html.md
+
1
-
0
View file @
f67b0d0e
...
...
@@ -59,6 +59,7 @@ $ curl \
"ID"
:
"127.0.0.1:4647"
,
"Leader"
:
true
,
"Node"
:
"bacon-mac.global"
,
"RaftProtocol"
:
2
,
"Voter"
:
true
}
]
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help