Revision 0b2454b9
| b/lib/cmdlib.py | ||
|---|---|---|
| 1774 | 1774 |
"master_candidate", |
| 1775 | 1775 |
"master", |
| 1776 | 1776 |
"offline", |
| 1777 |
"drained", |
|
| 1777 | 1778 |
) |
| 1778 | 1779 |
|
| 1779 | 1780 |
def ExpandNames(self): |
| ... | ... | |
| 1898 | 1899 |
val = node.name == master_node |
| 1899 | 1900 |
elif field == "offline": |
| 1900 | 1901 |
val = node.offline |
| 1902 |
elif field == "drained": |
|
| 1903 |
val = node.drained |
|
| 1901 | 1904 |
elif self._FIELDS_DYNAMIC.Matches(field): |
| 1902 | 1905 |
val = live_data[node.name].get(field, None) |
| 1903 | 1906 |
else: |
| ... | ... | |
| 6465 | 6468 |
"primary_ip": ninfo.primary_ip, |
| 6466 | 6469 |
"secondary_ip": ninfo.secondary_ip, |
| 6467 | 6470 |
"offline": ninfo.offline, |
| 6471 |
"drained": ninfo.drained, |
|
| 6468 | 6472 |
"master_candidate": ninfo.master_candidate, |
| 6469 | 6473 |
} |
| 6470 | 6474 |
|
| b/lib/rapi/rlib2.py | ||
|---|---|---|
| 39 | 39 |
"oper_state", "oper_ram", "status", |
| 40 | 40 |
"tags"] |
| 41 | 41 |
|
| 42 |
N_FIELDS = ["name", "offline", "master_candidate", |
|
| 42 |
N_FIELDS = ["name", "offline", "master_candidate", "drained",
|
|
| 43 | 43 |
"dtotal", "dfree", |
| 44 | 44 |
"mtotal", "mnode", "mfree", |
| 45 | 45 |
"pinst_cnt", "sinst_cnt", "tags", |
| b/scripts/gnt-node | ||
|---|---|---|
| 55 | 55 |
"serial_no": "SerialNo", |
| 56 | 56 |
"master_candidate": "MasterC", |
| 57 | 57 |
"master": "IsMaster", |
| 58 |
"offline": "Offline", |
|
| 58 |
"offline": "Offline", "drained": "Drained",
|
|
| 59 | 59 |
} |
| 60 | 60 |
|
| 61 | 61 |
|
| ... | ... | |
| 140 | 140 |
val = row[idx] |
| 141 | 141 |
if field in list_type_fields: |
| 142 | 142 |
val = ",".join(val) |
| 143 |
elif field in ('master', 'master_candidate', 'offline'):
|
|
| 143 |
elif field in ('master', 'master_candidate', 'offline', 'drained'):
|
|
| 144 | 144 |
if val: |
| 145 | 145 |
val = 'Y' |
| 146 | 146 |
else: |
| ... | ... | |
| 323 | 323 |
""" |
| 324 | 324 |
cl = GetClient() |
| 325 | 325 |
result = cl.QueryNodes(fields=["name", "pip", "sip", |
| 326 |
"pinst_list", "sinst_list"], |
|
| 326 |
"pinst_list", "sinst_list", |
|
| 327 |
"master_candidate", "drained", "offline"], |
|
| 327 | 328 |
names=args, use_locking=True) |
| 328 | 329 |
|
| 329 |
for name, primary_ip, secondary_ip, pinst, sinst in result: |
|
| 330 |
for (name, primary_ip, secondary_ip, pinst, sinst, |
|
| 331 |
is_mc, drained, offline) in result: |
|
| 330 | 332 |
ToStdout("Node name: %s", name)
|
| 331 | 333 |
ToStdout(" primary ip: %s", primary_ip)
|
| 332 | 334 |
ToStdout(" secondary ip: %s", secondary_ip)
|
| 335 |
ToStdout(" master candidate: %s", is_mc)
|
|
| 336 |
ToStdout(" drained: %s", drained)
|
|
| 337 |
ToStdout(" offline: %s", offline)
|
|
| 333 | 338 |
if pinst: |
| 334 | 339 |
ToStdout(" primary for instances:")
|
| 335 | 340 |
for iname in pinst: |
Also available in: Unified diff