Skip to content

Commit 6f7cf27

Browse files
authored
Cleanup: HttpTransact::StateMachineAction_t (#12533)
1 parent 9d3f934 commit 6f7cf27

3 files changed

Lines changed: 0 additions & 28 deletions

File tree

include/proxy/http/HttpTransact.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,6 @@ class HttpTransact
388388

389389
ORIGIN_SERVER_OPEN,
390390
ORIGIN_SERVER_RAW_OPEN,
391-
ORIGIN_SERVER_RR_MARK_DOWN,
392391

393392
READ_PUSH_HDR,
394393
STORE_PUSH_BODY,
@@ -407,7 +406,6 @@ class HttpTransact
407406
SERVER_PARSE_NEXT_HDR,
408407
TRANSFORM_READ,
409408
SSL_TUNNEL,
410-
CONTINUE,
411409

412410
API_SM_START,
413411
API_READ_REQUEST_HDR,

src/proxy/http/HttpDebugNames.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,6 @@ HttpDebugNames::get_action_name(HttpTransact::StateMachineAction_t e)
398398
case HttpTransact::StateMachineAction_t::ORIGIN_SERVER_RAW_OPEN:
399399
return ("StateMachineAction_t::ORIGIN_SERVER_RAW_OPEN");
400400

401-
case HttpTransact::StateMachineAction_t::ORIGIN_SERVER_RR_MARK_DOWN:
402-
return ("StateMachineAction_t::ORIGIN_SERVER_RR_MARK_DOWN");
403-
404401
case HttpTransact::StateMachineAction_t::READ_PUSH_HDR:
405402
return ("StateMachineAction_t::READ_PUSH_HDR");
406403

@@ -431,9 +428,6 @@ HttpDebugNames::get_action_name(HttpTransact::StateMachineAction_t e)
431428
case HttpTransact::StateMachineAction_t::SSL_TUNNEL:
432429
return ("StateMachineAction_t::SSL_TUNNEL");
433430

434-
case HttpTransact::StateMachineAction_t::CONTINUE:
435-
return ("StateMachineAction_t::CONTINUE");
436-
437431
case HttpTransact::StateMachineAction_t::API_READ_REQUEST_HDR:
438432
return ("StateMachineAction_t::API_READ_REQUEST_HDR");
439433

src/proxy/http/HttpSM.cc

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8243,21 +8243,6 @@ HttpSM::set_next_state()
82438243
break;
82448244
}
82458245

8246-
case HttpTransact::StateMachineAction_t::ORIGIN_SERVER_RR_MARK_DOWN: {
8247-
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_mark_os_down);
8248-
ATS_PROBE(next_state_SM_ACTION_ORIGIN_SERVER_RR_MARK_DOWN);
8249-
8250-
ink_assert(t_state.dns_info.looking_up == ResolveInfo::ORIGIN_SERVER);
8251-
8252-
// TODO: This might not be optimal (or perhaps even correct), but it will
8253-
// effectively mark the host as down. What's odd is that state_mark_os_down
8254-
// above isn't triggering.
8255-
HttpSM::do_hostdb_update_if_necessary();
8256-
8257-
do_hostdb_lookup();
8258-
break;
8259-
}
8260-
82618246
case HttpTransact::StateMachineAction_t::SSL_TUNNEL: {
82628247
t_state.api_next_action = HttpTransact::StateMachineAction_t::API_SEND_RESPONSE_HDR;
82638248
do_api_callout();
@@ -8332,11 +8317,6 @@ HttpSM::set_next_state()
83328317
break;
83338318
}
83348319

8335-
case HttpTransact::StateMachineAction_t::CONTINUE: {
8336-
ink_release_assert(!"Not implemented");
8337-
break;
8338-
}
8339-
83408320
default: {
83418321
ink_release_assert(!"Unknown next action");
83428322
}

0 commit comments

Comments
 (0)