Skip to content

Commit 4bfc63d

Browse files
committed
App state is not updating in cf cli and appsman ui when the app is down
Code review changes
1 parent 80f4e83 commit 4bfc63d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

lib/cloud_controller/diego/reporters/instances_stats_reporter.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ def actual_lrp_info(process, stats=nil, quota_stats=nil, log_cache_errors=nil, i
5454
if lrp_instances.include?(actual_lrp.actual_lrp_key.index)
5555
existing_lrp = lrp_instances[actual_lrp.actual_lrp_key.index]
5656
next if actual_lrp.since < existing_lrp.since
57-
58-
lrp_instances.delete(actual_lrp.actual_lrp_key.index)
59-
result.delete(actual_lrp.actual_lrp_key.index)
60-
lrp_instances[actual_lrp.actual_lrp_key.index] = actual_lrp
6157
end
6258

6359
lrp_state = state || LrpStateTranslator.translate_lrp_state(actual_lrp)

spec/unit/lib/cloud_controller/diego/reporters/instances_stats_reporter_spec.rb

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ def make_actual_lrp(instance_guid:, index:, state:, error:, since:)
149149
end
150150

151151
context 'when there are multiple lrps with the same index' do
152-
let(:bbs_actual_lrps_response) { [actual_lrp_1, actual_lrp_2, actual_lrp_3, actual_lrp_4] }
152+
let(:desired_instances) { 3 }
153+
let(:bbs_actual_lrps_response) { [actual_lrp_1, actual_lrp_2, actual_lrp_3, actual_lrp_4, actual_lrp_5] }
153154
let(:actual_lrp_1) do
154155
make_actual_lrp(
155156
instance_guid: '', index: 0, state: ::Diego::ActualLRPState::UNCLAIMED, error: 'some-details', since: two_days_ago_since_epoch_ns
@@ -181,14 +182,24 @@ def make_actual_lrp(instance_guid:, index:, state:, error:, since:)
181182
end
182183
end
183184

185+
let(:actual_lrp_5) do
186+
make_actual_lrp(
187+
instance_guid: 'instance-c', index: 2, state: ::Diego::ActualLRPState::RUNNING, error: 'some-details', since: two_days_ago_since_epoch_ns
188+
).tap do |actual_lrp|
189+
actual_lrp.actual_lrp_net_info = lrp_1_net_info
190+
end
191+
end
192+
184193
before do
185194
allow(bbs_instances_client).to receive_messages(lrp_instances: bbs_actual_lrps_response, desired_lrp_instance: bbs_desired_lrp_response)
186195
end
187196

188197
it 'shows all correct state for all instances' do
189198
result, = instances_reporter.stats_for_app(process)
199+
expect(result.length).to eq(3)
190200
expect(result[0][:state]).to eq('DOWN')
191201
expect(result[1][:state]).to eq('DOWN')
202+
expect(result[2][:state]).to eq('RUNNING')
192203
end
193204
end
194205

0 commit comments

Comments
 (0)