Skip to content

Commit cf72dcb

Browse files
committed
App state is not updating in cf cli and appsman ui when the app is down
Fix Rubocop error
1 parent b31d74d commit cf72dcb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/cloud_controller/diego/reporters/instances_stats_reporter.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ def actual_lrp_info(process, stats=nil, quota_stats=nil, log_cache_errors=nil, i
4949

5050
bbs_instances_client.lrp_instances(process).each do |actual_lrp|
5151
next unless actual_lrp.actual_lrp_key.index < process.instances
52+
5253
# if an LRP already exists with the same index use the one with the latest since value
5354

5455
if lrp_instances.include?(actual_lrp.actual_lrp_key.index)
55-
56+
5657
existing_lrp = lrp_instances[actual_lrp.actual_lrp_key.index]
57-
next if (actual_lrp.since < existing_lrp.since)
58+
next if actual_lrp.since < existing_lrp.since
59+
5860
lrp_instances.delete(actual_lrp.actual_lrp_key.index)
5961
result.delete(actual_lrp.actual_lrp_key.index)
6062
lrp_instances[actual_lrp.actual_lrp_key.index] = actual_lrp
@@ -66,7 +68,7 @@ def actual_lrp_info(process, stats=nil, quota_stats=nil, log_cache_errors=nil, i
6668
result[actual_lrp.actual_lrp_key.index] = info
6769
lrp_instances[actual_lrp.actual_lrp_key.index] = actual_lrp
6870
end
69-
71+
7072
fill_unreported_instances_with_down_instances(result, process, flat: false)
7173

7274
warnings = [log_cache_errors].compact

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def make_actual_lrp(instance_guid:, index:, state:, error:, since:)
159159
end
160160
let(:actual_lrp_2) do
161161
make_actual_lrp(
162-
instance_guid: 'instance-a', index: 0, state: ::Diego::ActualLRPState::RUNNING, error: 'some-details', since: two_days_ago_since_epoch_ns-1000
162+
instance_guid: 'instance-a', index: 0, state: ::Diego::ActualLRPState::RUNNING, error: 'some-details', since: two_days_ago_since_epoch_ns - 1000
163163
).tap do |actual_lrp|
164164
actual_lrp.actual_lrp_net_info = lrp_1_net_info
165165
end
@@ -175,7 +175,7 @@ def make_actual_lrp(instance_guid:, index:, state:, error:, since:)
175175

176176
let(:actual_lrp_4) do
177177
make_actual_lrp(
178-
instance_guid: 'instance-b', index: 1, state: ::Diego::ActualLRPState::CLAIMED, error: 'some-details', since: two_days_ago_since_epoch_ns-1000
178+
instance_guid: 'instance-b', index: 1, state: ::Diego::ActualLRPState::CLAIMED, error: 'some-details', since: two_days_ago_since_epoch_ns - 1000
179179
).tap do |actual_lrp|
180180
actual_lrp.actual_lrp_net_info = lrp_1_net_info
181181
end
@@ -192,8 +192,6 @@ def make_actual_lrp(instance_guid:, index:, state:, error:, since:)
192192
end
193193
end
194194

195-
196-
197195
context 'when a NoRunningInstances error is thrown for desired_lrp and it exists an actual_lrp' do
198196
let(:error) { CloudController::Errors::NoRunningInstances.new('No running instances ruh roh') }
199197
let(:expected_stopping_response) do

0 commit comments

Comments
 (0)