Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bbf783d

Browse files
authored
Merge pull request #4 from chapsuk/fix_hdp_use
Fixed some errors with HDP usage
2 parents 44ccb0d + 0e1cede commit bbf783d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

‎hdfs_datanode.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ def get_dninfo_metrics(self, bean):
117117
for k, v in volume_info_dict.items():
118118
path = k
119119
for key, val in v.items():
120-
state = key
121-
label = [self.cluster, version, path, state, self.target]
122-
value = val
123-
self.hadoop_datanode_metrics['DataNodeInfo'][metric].add_metric(label, value)
120+
if key != "storageType":
121+
state = key
122+
label = [self.cluster, version, path, state, self.target]
123+
value = val
124+
self.hadoop_datanode_metrics['DataNodeInfo'][metric].add_metric(label, value)
124125
else:
125126
continue
126127
else:

‎hdfs_journalnode.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ def collect(self):
3737
if 'tag.Hostname' in beans[i]:
3838
self.target = beans[i]["tag.Hostname"]
3939
break
40-
self.hadoop_datanode_metrics.update(self.common_metric_collector.get_metrics(beans, self.target))
40+
self.hadoop_journalnode_metrics.update(self.common_metric_collector.get_metrics(beans, self.target))
4141
self.get_metrics(beans)
4242

4343
for i in range(len(self.merge_list)):
4444
service = self.merge_list[i]
4545
if service in self.hadoop_journalnode_metrics:
46-
for metric in self.hadoop_datanode_metrics[service]:
47-
yield self.hadoop_datanode_metrics[service][metric]
46+
for metric in self.hadoop_journalnode_metrics[service]:
47+
yield self.hadoop_journalnode_metrics[service][metric]
4848

4949
def setup_journalnode_labels(self):
5050
a_60_latency_flag, a_300_latency_flag, a_3600_latency_flag = 1, 1, 1
@@ -126,7 +126,8 @@ def get_metrics(self, beans):
126126
a_3600_sum += beans[i][metric]
127127
else:
128128
key = metric
129-
self.hadoop_journalnode_metrics['JournalNode'][key].add_metric(label, beans[i][metric])
129+
if key in self.hadoop_journalnode_metrics['JournalNode']:
130+
self.hadoop_journalnode_metrics['JournalNode'][key].add_metric(label, beans[i][metric])
130131
a_60_bucket = zip(a_60_percentile, a_60_value)
131132
a_300_bucket = zip(a_300_percentile, a_300_value)
132133
a_3600_bucket = zip(a_3600_percentile, a_3600_value)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /