grpc 1.76.0 → 1.78.0.pre1

data/src/core/ext/transport/chttp2/transport/http2_client_transport.cc

@@ -19,56 +19,95 @@
 #include "src/core/ext/transport/chttp2/transport/http2_client_transport.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <limits.h>
 
+#include <algorithm>
+#include <cstddef>
 #include <cstdint>
+#include <iterator>
 #include <memory>
 #include <optional>
+#include <string>
 #include <utility>
+#include <vector>
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/call_spine.h"
 #include "src/core/call/message.h"
+#include "src/core/call/metadata.h"
 #include "src/core/call/metadata_batch.h"
+#include "src/core/call/metadata_info.h"
+#include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control_manager.h"
 #include "src/core/ext/transport/chttp2/transport/frame.h"
+#include "src/core/ext/transport/chttp2/transport/goaway.h"
 #include "src/core/ext/transport/chttp2/transport/header_assembler.h"
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
-#include "src/core/ext/transport/chttp2/transport/http2_settings_manager.h"
+#include "src/core/ext/transport/chttp2/transport/http2_settings_promises.h"
 #include "src/core/ext/transport/chttp2/transport/http2_status.h"
+#include "src/core/ext/transport/chttp2/transport/http2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/http2_ztrace_collector.h"
-#include "src/core/ext/transport/chttp2/transport/internal_channel_arg_names.h"
+#include "src/core/ext/transport/chttp2/transport/incoming_metadata_tracker.h"
+#include "src/core/ext/transport/chttp2/transport/keepalive.h"
 #include "src/core/ext/transport/chttp2/transport/message_assembler.h"
+#include "src/core/ext/transport/chttp2/transport/ping_promise.h"
+#include "src/core/ext/transport/chttp2/transport/stream.h"
 #include "src/core/ext/transport/chttp2/transport/stream_data_queue.h"
 #include "src/core/ext/transport/chttp2/transport/transport_common.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/for_each.h"
+#include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/match_promise.h"
 #include "src/core/lib/promise/party.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
+#include "src/core/lib/promise/race.h"
+#include "src/core/lib/promise/sleep.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/promise_endpoint.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/debug_location.h"
 #include "src/core/util/grpc_check.h"
+#include "src/core/util/latent_see.h"
+#include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
+#include "src/core/util/time.h"
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/cord.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 
 namespace grpc_core {
 namespace http2 {
 
+// TODO(akshitpatel)(tjagtap) [PH2][P2] : When settings frame increases incoming
+// window size, our transport must make the streams that were blocked on stream
+// flow control as writeable.
+
+// As a gRPC server never initiates a stream, the last incoming stream id on
+// the client side will always be 0.
+constexpr uint32_t kLastIncomingStreamIdClient = 0;
+
 using grpc_event_engine::experimental::EventEngine;
-using EnqueueResult = StreamDataQueue<ClientMetadataHandle>::EnqueueResult;
+using StreamWritabilityUpdate =
+    StreamDataQueue<ClientMetadataHandle>::StreamWritabilityUpdate;
 
 // Experimental : This is just the initial skeleton of class
 // and it is functions. The code will be written iteratively.
@@ -77,6 +116,32 @@ using EnqueueResult = StreamDataQueue<ClientMetadataHandle>::EnqueueResult;
 // TODO(tjagtap) : [PH2][P3] : Delete this comment when http2
 // rollout begins
 
+template <typename Factory>
+void Http2ClientTransport::SpawnInfallible(RefCountedPtr<Party> party,
+                                           absl::string_view name,
+                                           Factory&& factory) {
+  party->Spawn(name, std::forward<Factory>(factory), [](Empty) {});
+}
+
+template <typename Factory>
+void Http2ClientTransport::SpawnInfallibleTransportParty(absl::string_view name,
+                                                         Factory&& factory) {
+  SpawnInfallible(general_party_, name, std::forward<Factory>(factory));
+}
+
+template <typename Factory>
+void Http2ClientTransport::SpawnGuardedTransportParty(absl::string_view name,
+                                                      Factory&& factory) {
+  general_party_->Spawn(
+      name, std::forward<Factory>(factory),
+      [self = RefAsSubclass<Http2ClientTransport>()](absl::Status status) {
+        if (!status.ok()) {
+          GRPC_UNUSED absl::Status error = self->HandleError(
+              /*stream_id=*/std::nullopt, ToHttpOkOrConnError(status));
+        }
+      });
+}
+
 void Http2ClientTransport::PerformOp(grpc_transport_op* op) {
   // Notes : Refer : src/core/ext/transport/chaotic_good/client_transport.cc
   // Functions : StartConnectivityWatch, StopConnectivityWatch, PerformOp
@@ -118,90 +183,145 @@ void Http2ClientTransport::StopConnectivityWatch(
   state_tracker_.RemoveWatcher(watcher);
 }
 
+void Http2ClientTransport::ReportDisconnection(
+    const absl::Status& status, StateWatcher::DisconnectInfo disconnect_info,
+    const char* reason) {
+  MutexLock lock(&transport_mutex_);
+  ReportDisconnectionLocked(status, disconnect_info, reason);
+}
+
+void Http2ClientTransport::ReportDisconnectionLocked(
+    const absl::Status& status, StateWatcher::DisconnectInfo disconnect_info,
+    const char* reason) {
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ReportDisconnection: status="
+                         << status.ToString() << "; reason=" << reason;
+  state_tracker_.SetState(GRPC_CHANNEL_TRANSIENT_FAILURE, status, reason);
+  NotifyStateWatcherOnDisconnectLocked(status, disconnect_info);
+}
+
+void Http2ClientTransport::StartWatch(RefCountedPtr<StateWatcher> watcher) {
+  MutexLock lock(&transport_mutex_);
+  GRPC_CHECK(watcher_ == nullptr);
+  watcher_ = std::move(watcher);
+  if (is_transport_closed_) {
+    // TODO(tjagtap) : [PH2][P2] : Provide better status message and
+    // disconnect info here.
+    NotifyStateWatcherOnDisconnectLocked(
+        absl::UnknownError("transport closed before watcher started"), {});
+  } else {
+    // TODO(tjagtap) : [PH2][P2] : Notify the state watcher of the current
+    // value of the peer's MAX_CONCURRENT_STREAMS setting.
+  }
+}
+
+void Http2ClientTransport::StopWatch(RefCountedPtr<StateWatcher> watcher) {
+  MutexLock lock(&transport_mutex_);
+  if (watcher_ == watcher) watcher_.reset();
+}
+
+void Http2ClientTransport::NotifyStateWatcherOnDisconnectLocked(
+    absl::Status status, StateWatcher::DisconnectInfo disconnect_info) {
+  if (watcher_ == nullptr) return;
+  event_engine_->Run([watcher = std::move(watcher_), status = std::move(status),
+                      disconnect_info]() mutable {
+    ExecCtx exec_ctx;
+    watcher->OnDisconnect(std::move(status), disconnect_info);
+    watcher.reset();  // Before ExecCtx goes out of scope.
+  });
+}
+
 void Http2ClientTransport::Orphan() {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Orphan Begin";
   // Accessing general_party here is not advisable. It may so happen that
   // the party is already freed/may free up any time. The only guarantee here
   // is that the transport is still valid.
-  MaybeSpawnCloseTransport(Http2Status::AbslConnectionError(
-      absl::StatusCode::kUnavailable, "Orphaned"));
+  SourceDestructing();
+  MaybeSpawnCloseTransport(
+      ToHttpOkOrConnError(absl::UnavailableError("Orphaned")));
   Unref();
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Orphan End";
 }
 
-void Http2ClientTransport::AbortWithError() {
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport AbortWithError Begin";
-  // TODO(tjagtap) : [PH2][P2] : Implement this function.
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport AbortWithError End";
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Processing each type of frame
 
 Http2Status Http2ClientTransport::ProcessHttp2DataFrame(Http2DataFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-data
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2DataFrame { stream_id="
-                         << frame.stream_id
-                         << ", end_stream=" << frame.end_stream
-                         << ", payload=" << frame.payload.JoinIntoString()
-                         << "}";
+  GRPC_HTTP2_CLIENT_DLOG
+      << "Http2ClientTransport ProcessHttp2DataFrame { stream_id="
+      << frame.stream_id << ", end_stream=" << frame.end_stream
+      << ", payload=" << MaybeTruncatePayload(frame.payload)
+      << ", payload length=" << frame.payload.Length() << "}";
 
   // TODO(akshitpatel) : [PH2][P3] : Investigate if we should do this even if
   // the function returns a non-ok status?
-  ping_manager_.ReceivedDataFrame();
+  ping_manager_->ReceivedDataFrame();
 
   // Lookup stream
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2DataFrame LookupStream";
+  GRPC_HTTP2_CLIENT_DLOG
+      << "Http2ClientTransport ProcessHttp2DataFrame LookupStream";
   RefCountedPtr<Stream> stream = LookupStream(frame.stream_id);
+
+  ValueOrHttp2Status<chttp2::FlowControlAction> flow_control_action =
+      ProcessIncomingDataFrameFlowControl(current_frame_header_, flow_control_,
+                                          stream);
+  if (!flow_control_action.IsOk()) {
+    return ValueOrHttp2Status<chttp2::FlowControlAction>::TakeStatus(
+        std::move(flow_control_action));
+  }
+  ActOnFlowControlAction(flow_control_action.value(), stream);
+
   if (stream == nullptr) {
     // TODO(tjagtap) : [PH2][P2] : Implement the correct behaviour later.
     // RFC9113 : If a DATA frame is received whose stream is not in the "open"
     // or "half-closed (local)" state, the recipient MUST respond with a stream
     // error (Section 5.4.2) of type STREAM_CLOSED.
     GRPC_HTTP2_CLIENT_DLOG
-        << "Http2Transport ProcessHttp2DataFrame { stream_id="
+        << "Http2ClientTransport ProcessHttp2DataFrame { stream_id="
         << frame.stream_id << "} Lookup Failed";
     return Http2Status::Ok();
   }
 
-  if (stream->GetStreamState() == HttpStreamState::kHalfClosedRemote) {
-    return Http2Status::Http2StreamError(
-        Http2ErrorCode::kStreamClosed,
-        std::string(RFC9113::kHalfClosedRemoteState));
+  // TODO(akshitpatel) : [PH2][P3] : We should add a check to reset stream if
+  // the stream state is kIdle as well.
+
+  Http2Status stream_status = stream->CanStreamReceiveDataFrames();
+  if (!stream_status.IsOk()) {
+    return stream_status;
   }
 
   // Add frame to assembler
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2DataFrame AppendNewDataFrame";
+      << "Http2ClientTransport ProcessHttp2DataFrame AppendNewDataFrame";
   GrpcMessageAssembler& assembler = stream->assembler;
   Http2Status status =
       assembler.AppendNewDataFrame(frame.payload, frame.end_stream);
   if (!status.IsOk()) {
-    GRPC_HTTP2_CLIENT_DLOG
-        << "Http2Transport ProcessHttp2DataFrame AppendNewDataFrame Failed";
+    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessHttp2DataFrame "
+                              "AppendNewDataFrame Failed";
     return status;
   }
 
   // Pass the messages up the stack if it is ready.
   while (true) {
     GRPC_HTTP2_CLIENT_DLOG
-        << "Http2Transport ProcessHttp2DataFrame ExtractMessage";
+        << "Http2ClientTransport ProcessHttp2DataFrame ExtractMessage";
     ValueOrHttp2Status<MessageHandle> result = assembler.ExtractMessage();
     if (!result.IsOk()) {
       GRPC_HTTP2_CLIENT_DLOG
-          << "Http2Transport ProcessHttp2DataFrame ExtractMessage Failed";
+          << "Http2ClientTransport ProcessHttp2DataFrame ExtractMessage Failed";
       return ValueOrHttp2Status<MessageHandle>::TakeStatus(std::move(result));
     }
     MessageHandle message = TakeValue(std::move(result));
     if (message != nullptr) {
       GRPC_HTTP2_CLIENT_DLOG
-          << "Http2Transport ProcessHttp2DataFrame SpawnPushMessage "
+          << "Http2ClientTransport ProcessHttp2DataFrame SpawnPushMessage "
           << message->DebugString();
       stream->call.SpawnPushMessage(std::move(message));
       continue;
     }
     GRPC_HTTP2_CLIENT_DLOG
-        << "Http2Transport ProcessHttp2DataFrame While Break";
+        << "Http2ClientTransport ProcessHttp2DataFrame While Break";
     break;
   }
 
@@ -221,11 +341,14 @@ Http2Status Http2ClientTransport::ProcessHttp2HeaderFrame(
     Http2HeaderFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-headers
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2HeaderFrame Promise { stream_id="
+      << "Http2ClientTransport ProcessHttp2HeaderFrame Promise { stream_id="
       << frame.stream_id << ", end_headers=" << frame.end_headers
       << ", end_stream=" << frame.end_stream
-      << ", payload=" << frame.payload.JoinIntoString() << " }";
-  ping_manager_.ReceivedDataFrame();
+      << ", payload=" << MaybeTruncatePayload(frame.payload) << " }";
+  // State update MUST happen before processing the frame.
+  incoming_headers_.OnHeaderReceived(frame);
+
+  ping_manager_->ReceivedDataFrame();
 
   RefCountedPtr<Stream> stream = LookupStream(frame.stream_id);
   if (stream == nullptr) {
@@ -237,71 +360,82 @@ Http2Status Http2ClientTransport::ProcessHttp2HeaderFrame(
     // receives an unexpected stream identifier MUST respond with a connection
     // error (Section 5.4.1) of type PROTOCOL_ERROR.
     GRPC_HTTP2_CLIENT_DLOG
-        << "Http2Transport ProcessHttp2HeaderFrame Promise { stream_id="
+        << "Http2ClientTransport ProcessHttp2HeaderFrame Promise { stream_id="
         << frame.stream_id << "} Lookup Failed";
-    return Http2Status::Ok();
+    return ParseAndDiscardHeaders(std::move(frame.payload), frame.end_headers,
+                                  /*stream=*/nullptr, Http2Status::Ok());
   }
-  if (stream->GetStreamState() == HttpStreamState::kHalfClosedRemote) {
-    return Http2Status::Http2StreamError(
-        Http2ErrorCode::kStreamClosed,
-        std::string(RFC9113::kHalfClosedRemoteState));
+
+  if (stream->IsStreamHalfClosedRemote()) {
+    return ParseAndDiscardHeaders(
+        std::move(frame.payload), frame.end_headers, stream,
+        Http2Status::Http2StreamError(
+            Http2ErrorCode::kStreamClosed,
+            std::string(RFC9113::kHalfClosedRemoteState)));
   }
 
-  incoming_header_in_progress_ = !frame.end_headers;
-  incoming_header_stream_id_ = frame.stream_id;
-  incoming_header_end_stream_ = frame.end_stream;
-  if ((incoming_header_end_stream_ && stream->did_push_trailing_metadata) ||
-      (!incoming_header_end_stream_ && stream->did_push_initial_metadata)) {
-    return Http2Status::Http2StreamError(
-        Http2ErrorCode::kInternalError,
-        "gRPC Error : A gRPC server can send upto 1 initial metadata followed "
-        "by upto 1 trailing metadata");
+  if (incoming_headers_.ClientReceivedDuplicateMetadata(
+          stream->did_receive_initial_metadata,
+          stream->did_receive_trailing_metadata)) {
+    return ParseAndDiscardHeaders(
+        std::move(frame.payload), frame.end_headers, stream,
+        Http2Status::Http2StreamError(
+            Http2ErrorCode::kInternalError,
+            std::string(GrpcErrors::kTooManyMetadata)));
   }
 
-  HeaderAssembler& assembler = stream->header_assembler;
-  Http2Status append_result = assembler.AppendHeaderFrame(std::move(frame));
-  if (append_result.IsOk()) {
-    return ProcessMetadata(stream);
+  Http2Status append_result = stream->header_assembler.AppendHeaderFrame(frame);
+  if (!append_result.IsOk()) {
+    // Frame payload is not consumed if AppendHeaderFrame returns a non-OK
+    // status. We need to process it to keep our in consistent state.
+    return ParseAndDiscardHeaders(std::move(frame.payload), frame.end_headers,
+                                  stream, std::move(append_result));
   }
-  return append_result;
+
+  Http2Status status = ProcessMetadata(stream);
+  if (!status.IsOk()) {
+    // Frame payload has been moved to the HeaderAssembler. So calling
+    // ParseAndDiscardHeaders with an empty buffer.
+    return ParseAndDiscardHeaders(SliceBuffer(), frame.end_headers, stream,
+                                  std::move(status));
+  }
+
+  // Frame payload has either been processed or moved to the HeaderAssembler.
+  return Http2Status::Ok();
 }
 
 Http2Status Http2ClientTransport::ProcessMetadata(
     RefCountedPtr<Stream> stream) {
-  const uint32_t stream_id = stream->GetStreamId();
   HeaderAssembler& assembler = stream->header_assembler;
   CallHandler call = stream->call;
 
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessMetadata";
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessMetadata";
   if (assembler.IsReady()) {
     ValueOrHttp2Status<ServerMetadataHandle> read_result =
-        assembler.ReadMetadata(parser_, !incoming_header_end_stream_,
+        assembler.ReadMetadata(parser_, !incoming_headers_.HeaderHasEndStream(),
                                /*is_client=*/true,
                                /*max_header_list_size_soft_limit=*/
-                               max_header_list_size_soft_limit_,
+                               incoming_headers_.soft_limit(),
                                /*max_header_list_size_hard_limit=*/
-                               settings_.acked().max_header_list_size());
+                               settings_->acked().max_header_list_size());
     if (read_result.IsOk()) {
       ServerMetadataHandle metadata = TakeValue(std::move(read_result));
-      if (incoming_header_end_stream_) {
+      if (incoming_headers_.HeaderHasEndStream()) {
         // TODO(tjagtap) : [PH2][P1] : Is this the right way to differentiate
         // between initial and trailing metadata?
-        GRPC_HTTP2_CLIENT_DLOG
-            << "Http2Transport ProcessMetadata SpawnPushServerTrailingMetadata";
         stream->MarkHalfClosedRemote();
-        BeginCloseStream(
-            stream_id,
-            Http2ErrorCodeToRstFrameErrorCode(Http2ErrorCode::kNoError),
-            std::move(metadata));
+        stream->did_receive_trailing_metadata = true;
+        BeginCloseStream(stream, /*reset_stream_error_code=*/std::nullopt,
+                         std::move(metadata));
       } else {
-        GRPC_HTTP2_CLIENT_DLOG
-            << "Http2Transport ProcessMetadata SpawnPushServerInitialMetadata";
-        stream->did_push_initial_metadata = true;
+        GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessMetadata "
+                                  "SpawnPushServerInitialMetadata";
+        stream->did_receive_initial_metadata = true;
         call.SpawnPushServerInitialMetadata(std::move(metadata));
       }
       return Http2Status::Ok();
     }
-    GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessMetadata Failed";
+    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessMetadata Failed";
     return ValueOrHttp2Status<Arena::PoolPtr<grpc_metadata_batch>>::TakeStatus(
         std::move(read_result));
   }
@@ -312,14 +446,18 @@ Http2Status Http2ClientTransport::ProcessHttp2RstStreamFrame(
     Http2RstStreamFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-rst_stream
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2RstStreamFrame { stream_id="
+      << "Http2ClientTransport ProcessHttp2RstStreamFrame { stream_id="
       << frame.stream_id << ", error_code=" << frame.error_code << " }";
-  Http2ErrorCode error_code =
-      RstFrameErrorCodeToHttp2ErrorCode(frame.error_code);
+
+  Http2ErrorCode error_code = FrameErrorCodeToHttp2ErrorCode(frame.error_code);
   absl::Status status = absl::Status(ErrorCodeToAbslStatusCode(error_code),
                                      "Reset stream frame received.");
-  BeginCloseStream(frame.stream_id, /*reset_stream_error_code=*/std::nullopt,
-                   CancelledServerMetadataFromStatus(status));
+  RefCountedPtr<Stream> stream = LookupStream(frame.stream_id);
+  if (stream != nullptr) {
+    stream->MarkHalfClosedRemote();
+    BeginCloseStream(stream, /*reset_stream_error_code=*/std::nullopt,
+                     CancelledServerMetadataFromStatus(status));
+  }
 
   // In case of stream error, we do not want the Read Loop to be broken. Hence
   // returning an ok status.
@@ -330,33 +468,28 @@ Http2Status Http2ClientTransport::ProcessHttp2SettingsFrame(
     Http2SettingsFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-settings
 
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2SettingsFrame { ack="
-                         << frame.ack
-                         << ", settings length=" << frame.settings.size()
-                         << "}";
-
-  // The connector code needs us to run this
-  if (on_receive_settings_ != nullptr) {
-    ExecCtx::Run(DEBUG_LOCATION, on_receive_settings_, absl::OkStatus());
-    on_receive_settings_ = nullptr;
-  }
+  GRPC_HTTP2_CLIENT_DLOG
+      << "Http2ClientTransport ProcessHttp2SettingsFrame { ack=" << frame.ack
+      << ", settings length=" << frame.settings.size() << "}";
 
-  // TODO(tjagtap) : [PH2][P2] Decide later if we want this only for AckLastSend
-  // or does any other operation also need this lock.
-  MutexLock lock(&transport_mutex_);
   if (!frame.ack) {
-    // Check if the received settings have legal values
     Http2Status status = ValidateSettingsValues(frame.settings);
     if (!status.IsOk()) {
       return status;
     }
-    // TODO(tjagtap) : [PH2][P1]
-    // Apply the new settings
-    // Quickly send the ACK to the peer once the settings are applied
+    settings_->BufferPeerSettings(std::move(frame.settings));
+    SpawnGuardedTransportParty("SettingsAck", TriggerWriteCycle());
+    if (GPR_UNLIKELY(!settings_->IsFirstPeerSettingsApplied())) {
+      // Apply the first settings before we read any other frames.
+      reader_state_.SetPauseReadLoop();
+    }
   } else {
-    // Process the SETTINGS ACK Frame
-    if (settings_.AckLastSend()) {
-      transport_settings_.OnSettingsAckReceived();
+    if (settings_->OnSettingsAckReceived()) {
+      parser_.hpack_table()->SetMaxBytes(
+          settings_->acked().header_table_size());
+      ActOnFlowControlAction(flow_control_.SetAckedInitialWindow(
+                                 settings_->acked().initial_window_size()),
+                             /*stream=*/nullptr);
     } else {
       // TODO(tjagtap) [PH2][P4] : The RFC does not say anything about what
       // should happen if we receive an unsolicited SETTINGS ACK. Decide if we
@@ -370,7 +503,7 @@ Http2Status Http2ClientTransport::ProcessHttp2SettingsFrame(
 
 auto Http2ClientTransport::ProcessHttp2PingFrame(Http2PingFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-ping
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2PingFrame { ack="
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessHttp2PingFrame { ack="
                          << frame.ack << ", opaque=" << frame.opaque << " }";
   return AssertResultType<Http2Status>(If(
       frame.ack,
@@ -379,37 +512,114 @@ auto Http2ClientTransport::ProcessHttp2PingFrame(Http2PingFrame frame) {
         return self->AckPing(opaque);
       },
       [self = RefAsSubclass<Http2ClientTransport>(), opaque = frame.opaque]() {
-        // TODO(akshitpatel) : [PH2][P2] : Have a counter to track number of
-        // pending induced frames (Ping/Settings Ack). This is to ensure that
-        // if write is taking a long time, we can stop reads and prioritize
-        // writes.
-        // RFC9113: PING responses SHOULD be given higher priority than any
-        // other frame.
-        self->ping_manager_.AddPendingPingAck(opaque);
-        // TODO(akshitpatel) : [PH2][P2] : This is done assuming that the other
-        // ProcessFrame promises may return stream or connection failures. If
-        // this does not turn out to be true, consider returning absl::Status
-        // here.
-        return Map(self->TriggerWriteCycle(), [](absl::Status status) {
-          return (status.ok())
-                     ? Http2Status::Ok()
-                     : Http2Status::AbslConnectionError(
-                           status.code(), std::string(status.message()));
-        });
+        return If(
+            self->test_only_ack_pings_,
+            [self, opaque]() {
+              // TODO(akshitpatel) : [PH2][P2] : Have a counter to track number
+              // of pending induced frames (Ping/Settings Ack). This is to
+              // ensure that if write is taking a long time, we can stop reads
+              // and prioritize writes. RFC9113: PING responses SHOULD be given
+              // higher priority than any other frame.
+              self->ping_manager_->AddPendingPingAck(opaque);
+              // TODO(akshitpatel) : [PH2][P2] : This is done assuming that the
+              // other ProcessFrame promises may return stream or connection
+              // failures. If this does not turn out to be true, consider
+              // returning absl::Status here.
+              return Map(self->TriggerWriteCycle(), [](absl::Status status) {
+                return ToHttpOkOrConnError(status);
+              });
+            },
+            []() {
+              GRPC_HTTP2_CLIENT_DLOG
+                  << "Http2ClientTransport ProcessHttp2PingFrame "
+                     "test_only_ack_pings_ is false. Ignoring the ping "
+                     "request.";
+              return Immediate(Http2Status::Ok());
+            });
       }));
 }
 
 Http2Status Http2ClientTransport::ProcessHttp2GoawayFrame(
     Http2GoawayFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-goaway
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2GoawayFrame Factory";
-  // TODO(tjagtap) : [PH2][P2] : Implement this.
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2GoawayFrame Promise { "
-                            "last_stream_id="
-                         << frame.last_stream_id
-                         << ", error_code=" << frame.error_code
-                         << ", debug_data=" << frame.debug_data.as_string_view()
-                         << "}";
+  GRPC_HTTP2_CLIENT_DLOG
+      << "Http2ClientTransport ProcessHttp2GoawayFrame Promise { "
+         "last_stream_id="
+      << frame.last_stream_id << ", error_code=" << frame.error_code
+      << ", debug_data=" << frame.debug_data.as_string_view() << "}";
+  LOG_IF(ERROR,
+         frame.error_code != static_cast<uint32_t>(Http2ErrorCode::kNoError))
+      << "Received GOAWAY frame with error code: " << frame.error_code
+      << " and debug data: " << frame.debug_data.as_string_view();
+
+  uint32_t last_stream_id = 0;
+  absl::Status status(ErrorCodeToAbslStatusCode(
+                          FrameErrorCodeToHttp2ErrorCode(frame.error_code)),
+                      frame.debug_data.as_string_view());
+  if (frame.error_code == static_cast<uint32_t>(Http2ErrorCode::kNoError) &&
+      frame.last_stream_id == RFC9113::kMaxStreamId31Bit) {
+    const uint32_t next_stream_id = PeekNextStreamId();
+    last_stream_id = (next_stream_id > 1) ? next_stream_id - 2 : 0;
+  } else {
+    last_stream_id = frame.last_stream_id;
+  }
+  SetMaxAllowedStreamId(last_stream_id);
+
+  bool close_transport = false;
+  {
+    MutexLock lock(&transport_mutex_);
+    if (CanCloseTransportLocked()) {
+      close_transport = true;
+      GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessHttp2GoawayFrame "
+                                "stream_list_ is empty";
+    }
+  }
+
+  StateWatcher::DisconnectInfo disconnect_info;
+  disconnect_info.reason = Transport::StateWatcher::kGoaway;
+  disconnect_info.http2_error_code =
+      static_cast<Http2ErrorCode>(frame.error_code);
+
+  // Throttle keepalive time if the server sends a GOAWAY with error code
+  // ENHANCE_YOUR_CALM and debug data equal to "too_many_pings". This will
+  // apply to any new transport created on by any subchannel of this channel.
+  if (GPR_UNLIKELY(frame.error_code == static_cast<uint32_t>(
+                                           Http2ErrorCode::kEnhanceYourCalm) &&
+                   frame.debug_data == "too_many_pings")) {
+    LOG(ERROR) << ": Received a GOAWAY with error code ENHANCE_YOUR_CALM and "
+                  "debug data equal to \"too_many_pings\". Current keepalive "
+                  "time (before throttling): "
+               << keepalive_time_.ToString();
+    constexpr int max_keepalive_time_millis =
+        INT_MAX / KEEPALIVE_TIME_BACKOFF_MULTIPLIER;
+    uint64_t throttled_keepalive_time =
+        keepalive_time_.millis() > max_keepalive_time_millis
+            ? INT_MAX
+            : keepalive_time_.millis() * KEEPALIVE_TIME_BACKOFF_MULTIPLIER;
+    if (!IsTransportStateWatcherEnabled()) {
+      status.SetPayload(kKeepaliveThrottlingKey,
+                        absl::Cord(std::to_string(throttled_keepalive_time)));
+    }
+    disconnect_info.keepalive_time =
+        Duration::Milliseconds(throttled_keepalive_time);
+  }
+
+  if (close_transport) {
+    // TODO(akshitpatel) : [PH2][P3] : Ideally the error here should be
+    // kNoError. However, Http2Status does not support kNoError. We should
+    // revisit this and update the error code.
+    MaybeSpawnCloseTransport(Http2Status::Http2ConnectionError(
+        FrameErrorCodeToHttp2ErrorCode((
+            frame.error_code ==
+                    Http2ErrorCodeToFrameErrorCode(Http2ErrorCode::kNoError)
+                ? Http2ErrorCodeToFrameErrorCode(Http2ErrorCode::kInternalError)
+                : frame.error_code)),
+        std::string(frame.debug_data.as_string_view())));
+  }
+
+  // lie: use transient failure from the transport to indicate goaway has been
+  // received.
+  ReportDisconnection(status, disconnect_info, "got_goaway");
   return Http2Status::Ok();
 }
 
@@ -417,23 +627,30 @@ Http2Status Http2ClientTransport::ProcessHttp2WindowUpdateFrame(
     Http2WindowUpdateFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-window_update
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2WindowUpdateFrame Factory";
-  // TODO(tjagtap) : [PH2][P2] : Implement this.
-  GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2WindowUpdateFrame Promise { "
+      << "Http2ClientTransport ProcessHttp2WindowUpdateFrame Promise { "
          " stream_id="
       << frame.stream_id << ", increment=" << frame.increment << "}";
+
+  RefCountedPtr<Stream> stream = nullptr;
   if (frame.stream_id != 0) {
-    RefCountedPtr<Stream> stream = LookupStream(frame.stream_id);
-    if (stream != nullptr) {
-      chttp2::StreamFlowControl::OutgoingUpdateContext fc_update(
-          &stream->flow_control);
-      fc_update.RecvUpdate(frame.increment);
+    stream = LookupStream(frame.stream_id);
+  }
+  if (stream != nullptr) {
+    StreamWritabilityUpdate update =
+        stream->ReceivedFlowControlWindowUpdate(frame.increment);
+    if (update.became_writable) {
+      absl::Status status = writable_stream_list_.EnqueueWrapper(
+          stream, update.priority, AreTransportFlowControlTokensAvailable());
+      if (!status.ok()) {
+        return ToHttpOkOrConnError(status);
+      }
     }
-  } else {
-    chttp2::TransportFlowControl::OutgoingUpdateContext fc_update(
-        &flow_control_);
-    fc_update.RecvUpdate(frame.increment);
+  }
+
+  const bool should_trigger_write =
+      ProcessIncomingWindowUpdateFrameFlowControl(frame, flow_control_, stream);
+  if (should_trigger_write) {
+    SpawnGuardedTransportParty("TransportTokensAvailable", TriggerWriteCycle());
   }
   return Http2Status::Ok();
 }
@@ -442,11 +659,14 @@ Http2Status Http2ClientTransport::ProcessHttp2ContinuationFrame(
     Http2ContinuationFrame frame) {
   // https://www.rfc-editor.org/rfc/rfc9113.html#name-continuation
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2Transport ProcessHttp2ContinuationFrame Promise { "
+      << "Http2ClientTransport ProcessHttp2ContinuationFrame Promise { "
          "stream_id="
       << frame.stream_id << ", end_headers=" << frame.end_headers
-      << ", payload=" << frame.payload.JoinIntoString() << " }";
-  incoming_header_in_progress_ = !frame.end_headers;
+      << ", payload=" << MaybeTruncatePayload(frame.payload) << " }";
+
+  // State update MUST happen before processing the frame.
+  incoming_headers_.OnContinuationReceived(frame);
+
   RefCountedPtr<Stream> stream = LookupStream(frame.stream_id);
   if (stream == nullptr) {
     // TODO(tjagtap) : [PH2][P3] : Implement this.
@@ -456,32 +676,45 @@ Http2Status Http2ClientTransport::ProcessHttp2ContinuationFrame(
     // frame and streams that are reserved using PUSH_PROMISE. An endpoint that
     // receives an unexpected stream identifier MUST respond with a connection
     // error (Section 5.4.1) of type PROTOCOL_ERROR.
-    return Http2Status::Ok();
+    return ParseAndDiscardHeaders(std::move(frame.payload), frame.end_headers,
+                                  nullptr, Http2Status::Ok());
+  }
+
+  if (stream->IsStreamHalfClosedRemote()) {
+    return ParseAndDiscardHeaders(
+        std::move(frame.payload), frame.end_headers, stream,
+        Http2Status::Http2StreamError(
+            Http2ErrorCode::kStreamClosed,
+            std::string(RFC9113::kHalfClosedRemoteState)));
   }
-  if (stream->GetStreamState() == HttpStreamState::kHalfClosedRemote) {
-    return Http2Status::Http2StreamError(
-        Http2ErrorCode::kStreamClosed,
-        std::string(RFC9113::kHalfClosedRemoteState));
+
+  Http2Status append_result =
+      stream->header_assembler.AppendContinuationFrame(frame);
+  if (!append_result.IsOk()) {
+    // Frame payload is not consumed if AppendContinuationFrame returns a
+    // non-OK status. We need to process it to keep our in consistent state.
+    return ParseAndDiscardHeaders(std::move(frame.payload), frame.end_headers,
+                                  stream, std::move(append_result));
   }
 
-  HeaderAssembler& assember = stream->header_assembler;
-  Http2Status result = assember.AppendContinuationFrame(std::move(frame));
-  if (result.IsOk()) {
-    return ProcessMetadata(stream);
+  Http2Status status = ProcessMetadata(stream);
+  if (!status.IsOk()) {
+    // Frame payload is consumed by HeaderAssembler. So passing an empty
+    // SliceBuffer to ParseAndDiscardHeaders.
+    return ParseAndDiscardHeaders(SliceBuffer(), frame.end_headers, stream,
+                                  std::move(status));
   }
-  return result;
+
+  // Frame payload has either been processed or moved to the HeaderAssembler.
+  return Http2Status::Ok();
 }
 
 Http2Status Http2ClientTransport::ProcessHttp2SecurityFrame(
     Http2SecurityFrame frame) {
-  GRPC_HTTP2_CLIENT_DLOG << "Http2Transport ProcessHttp2SecurityFrame "
-                            "ProcessHttp2SecurityFrame { payload="
-                         << frame.payload.JoinIntoString() << " }";
-  if ((settings_.acked().allow_security_frame() ||
-       settings_.local().allow_security_frame()) &&
-      settings_.peer().allow_security_frame()) {
-    // TODO(tjagtap) : [PH2][P4] : Evaluate when to accept the frame and when to
-    // reject it. Compare it with the requirement and with CHTTP2.
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport ProcessHttp2SecurityFrame "
+                            "{ payload.Length="
+                         << frame.payload.Length() << " }";
+  if (settings_->IsSecurityFrameExpected()) {
     // TODO(tjagtap) : [PH2][P3] : Add handling of Security frame
     // Just the frame.payload needs to be passed to the endpoint_ object.
     // Refer usage of TransportFramingEndpointExtension.
@@ -525,7 +758,7 @@ auto Http2ClientTransport::ProcessOneFrame(Http2Frame frame) {
         return self->ProcessHttp2SecurityFrame(std::move(frame));
       },
       [](GRPC_UNUSED Http2UnknownFrame frame) {
-        // As per HTTP2 RFC, implementations MUST ignore and discard frames of
+        // RFC9113: Implementations MUST ignore and discard frames of
         // unknown types.
         return Http2Status::Ok();
       },
@@ -536,8 +769,64 @@ auto Http2ClientTransport::ProcessOneFrame(Http2Frame frame) {
       }));
 }
 
+Http2Status Http2ClientTransport::ParseAndDiscardHeaders(
+    SliceBuffer&& buffer, const bool is_end_headers,
+    const RefCountedPtr<Stream> stream, Http2Status&& original_status,
+    DebugLocation whence) {
+  const bool is_initial_metadata = !incoming_headers_.HeaderHasEndStream();
+  const uint32_t incoming_stream_id = incoming_headers_.GetStreamId();
+  GRPC_HTTP2_CLIENT_DLOG
+      << "Http2ClientTransport ParseAndDiscardHeaders buffer "
+         "size: "
+      << buffer.Length() << " is_initial_metadata: " << is_initial_metadata
+      << " is_end_headers: " << is_end_headers
+      << " incoming_stream_id: " << incoming_stream_id
+      << " stream_id: " << (stream == nullptr ? 0 : stream->GetStreamId())
+      << " original_status: " << original_status.DebugString()
+      << " whence: " << whence.file() << ":" << whence.line();
+
+  return http2::ParseAndDiscardHeaders(
+      parser_, std::move(buffer),
+      HeaderAssembler::ParseHeaderArgs{
+          /*is_initial_metadata=*/is_initial_metadata,
+          /*is_end_headers=*/is_end_headers,
+          /*is_client=*/true,
+          /*max_header_list_size_soft_limit=*/
+          incoming_headers_.soft_limit(),
+          /*max_header_list_size_hard_limit=*/
+          settings_->acked().max_header_list_size(),
+          /*stream_id=*/incoming_stream_id,
+      },
+      stream, std::move(original_status));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Read Related Promises and Promise Factories
+auto Http2ClientTransport::EndpointReadSlice(const size_t num_bytes) {
+  return Map(
+      endpoint_.ReadSlice(num_bytes),
+      [self = RefAsSubclass<Http2ClientTransport>(),
+       num_bytes](absl::StatusOr<Slice> status) {
+        if (status.ok()) {
+          self->keepalive_manager_->GotData();
+          self->ztrace_collector_->Append(PromiseEndpointReadTrace{num_bytes});
+        }
+        return status;
+      });
+}
+
+auto Http2ClientTransport::EndpointRead(const size_t num_bytes) {
+  return Map(
+      endpoint_.Read(num_bytes),
+      [self = RefAsSubclass<Http2ClientTransport>(),
+       num_bytes](absl::StatusOr<SliceBuffer> status) {
+        if (status.ok()) {
+          self->keepalive_manager_->GotData();
+          self->ztrace_collector_->Append(PromiseEndpointReadTrace{num_bytes});
+        }
+        return status;
+      });
+}
 
 auto Http2ClientTransport::ReadAndProcessOneFrame() {
   GRPC_HTTP2_CLIENT_DLOG
@@ -556,10 +845,16 @@ auto Http2ClientTransport::ReadAndProcessOneFrame() {
       // Validate the incoming frame as per the current state of the transport
       [self = RefAsSubclass<Http2ClientTransport>()](Http2FrameHeader header) {
         Http2Status status = ValidateFrameHeader(
-            /*max_frame_size_setting*/ self->settings_.acked().max_frame_size(),
-            /*incoming_header_in_progress*/ self->incoming_header_in_progress_,
-            /*incoming_header_stream_id*/ self->incoming_header_stream_id_,
-            /*current_frame_header*/ header);
+            /*max_frame_size_setting*/ self->settings_->acked()
+                .max_frame_size(),
+            /*incoming_header_in_progress*/
+            self->incoming_headers_.IsWaitingForContinuationFrame(),
+            /*incoming_header_stream_id*/
+            self->incoming_headers_.GetStreamId(),
+            /*current_frame_header*/ header,
+            /*last_stream_id=*/self->GetLastStreamId(),
+            /*is_client=*/true, /*is_first_settings_processed=*/
+            self->settings_->IsFirstPeerSettingsApplied());
 
         if (GPR_UNLIKELY(!status.IsOk())) {
           GRPC_DCHECK(status.GetType() ==
@@ -584,7 +879,7 @@ auto Http2ClientTransport::ReadAndProcessOneFrame() {
           SliceBuffer payload) -> absl::StatusOr<Http2Frame> {
         GRPC_HTTP2_CLIENT_DLOG
             << "Http2ClientTransport ReadAndProcessOneFrame ParseFramePayload "
-            << payload.JoinIntoString();
+            << MaybeTruncatePayload(payload);
         ValueOrHttp2Status<Http2Frame> frame =
             ParseFramePayload(self->current_frame_header_, std::move(payload));
         if (!frame.IsOk()) {
@@ -607,6 +902,9 @@ auto Http2ClientTransport::ReadAndProcessOneFrame() {
               }
               return absl::OkStatus();
             }));
+      },
+      [self = RefAsSubclass<Http2ClientTransport>()]() -> Poll<absl::Status> {
+        return self->reader_state_.MaybePauseReadLoop();
       }));
 }
 
@@ -623,95 +921,155 @@ auto Http2ClientTransport::ReadLoop() {
       }));
 }
 
-auto Http2ClientTransport::OnReadLoopEnded() {
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport OnReadLoopEnded Factory";
-  return
-      [self = RefAsSubclass<Http2ClientTransport>()](absl::Status status) {
+///////////////////////////////////////////////////////////////////////////////
+// Flow Control for the Transport
+
+auto Http2ClientTransport::FlowControlPeriodicUpdateLoop() {
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport PeriodicUpdateLoop Factory";
+  return AssertResultType<absl::Status>(
+      Loop([self = RefAsSubclass<Http2ClientTransport>()]() {
         GRPC_HTTP2_CLIENT_DLOG
-            << "Http2ClientTransport OnReadLoopEnded Promise Status=" << status;
-        GRPC_UNUSED absl::Status error = self->HandleError(
-            std::nullopt, Http2Status::AbslConnectionError(
-                              status.code(), std::string(status.message())));
-      };
+            << "Http2ClientTransport FlowControlPeriodicUpdateLoop Loop";
+        return TrySeq(
+            // TODO(tjagtap) [PH2][P2][BDP] Remove this static sleep when the
+            // BDP code is done.
+            Sleep(chttp2::kFlowControlPeriodicUpdateTimer),
+            [self]() -> Poll<absl::Status> {
+              GRPC_HTTP2_CLIENT_DLOG
+                  << "Http2ClientTransport FlowControl PeriodicUpdate()";
+              chttp2::FlowControlAction action =
+                  self->flow_control_.PeriodicUpdate();
+              bool is_action_empty = action == chttp2::FlowControlAction();
+              // This may trigger a write cycle
+              self->ActOnFlowControlAction(action, nullptr);
+              if (is_action_empty) {
+                // TODO(tjagtap) [PH2][P2][BDP] Remove this when the BDP code is
+                // done. We must continue to do PeriodicUpdate once BDP is in
+                // place.
+                MutexLock lock(&self->transport_mutex_);
+                if (self->GetActiveStreamCountLocked() == 0) {
+                  self->AddPeriodicUpdatePromiseWaker();
+                  return Pending{};
+                }
+              }
+              return absl::OkStatus();
+            },
+            [self]() -> LoopCtl<absl::Status> { return Continue{}; });
+      }));
 }
 
 // Equivalent to grpc_chttp2_act_on_flowctl_action in chttp2_transport.cc
-// TODO(tjagtap) : [PH2][P4] : grpc_chttp2_act_on_flowctl_action has a "reason"
-// parameter which looks like it would be really helpful for debugging. Add that
 void Http2ClientTransport::ActOnFlowControlAction(
-    const chttp2::FlowControlAction& action, const uint32_t stream_id) {
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::ActOnFlowControlAction";
+    const chttp2::FlowControlAction& action, RefCountedPtr<Stream> stream) {
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::ActOnFlowControlAction"
+                         << action.DebugString();
   if (action.send_stream_update() != kNoActionNeeded) {
-    GRPC_DCHECK_GT(stream_id, 0u);
-    RefCountedPtr<Stream> stream = LookupStream(stream_id);
     if (GPR_LIKELY(stream != nullptr)) {
-      const HttpStreamState state = stream->GetStreamState();
-      if (state != HttpStreamState::kHalfClosedRemote &&
-          state != HttpStreamState::kClosed) {
-        // Stream is not remotely closed, so sending a WINDOW_UPDATE is
-        // potentially useful.
-        // TODO(tjagtap) : [PH2][P1] Plumb with flow control
+      GRPC_DCHECK_GT(stream->GetStreamId(), 0u);
+      if (stream->CanSendWindowUpdateFrames()) {
+        window_update_list_.insert(stream->GetStreamId());
+        GRPC_HTTP2_CLIENT_DLOG
+            << "Http2ClientTransport::ActOnFlowControlAction "
+               "added stream "
+            << stream->GetStreamId() << " to window_update_list_";
       }
     } else {
       GRPC_HTTP2_CLIENT_DLOG
-          << "Http2ClientTransport ActOnFlowControlAction stream is null";
+          << "Http2ClientTransport::ActOnFlowControlAction stream is null";
     }
   }
 
-  if (action.send_transport_update() != kNoActionNeeded) {
-    // TODO(tjagtap) : [PH2][P1] Plumb with flow control
-  }
-
-  // TODO(tjagtap) : [PH2][P1] Plumb
-  // enable_preferred_rx_crypto_frame_advertisement with settings
   ActOnFlowControlActionSettings(
-      action, settings_.mutable_local(),
-      /*enable_preferred_rx_crypto_frame_advertisement=*/true);
+      action, settings_->mutable_local(),
+      enable_preferred_rx_crypto_frame_advertisement_);
 
   if (action.AnyUpdateImmediately()) {
-    TriggerWriteCycle();
+    // Prioritize sending flow control updates over reading data. If we
+    // continue reading while urgent flow control updates are pending, we might
+    // exhaust the flow control window. This prevents us from sending window
+    // updates to the peer, causing the peer to block unnecessarily while
+    // waiting for flow control tokens.
+    reader_state_.SetPauseReadLoop();
+    SpawnGuardedTransportParty("SendControlFrames", TriggerWriteCycle());
+    GRPC_HTTP2_CLIENT_DLOG << "Update Immediately : "
+                           << action.ImmediateUpdateReasons();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Write Related Promises and Promise Factories
 
-auto Http2ClientTransport::WriteControlFrames() {
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport WriteControlFrames Factory";
+auto Http2ClientTransport::ProcessAndWriteControlFrames() {
   SliceBuffer output_buf;
   if (is_first_write_) {
-    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Write "
+    // RFC9113: That is, the connection preface starts with the string
+    // "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+    // This sequence MUST be followed by a SETTINGS frame, which MAY be empty.
+    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport WriteControlFrames "
                               "GRPC_CHTTP2_CLIENT_CONNECT_STRING";
-    output_buf.Append(Slice(
-        grpc_slice_from_copied_string(GRPC_CHTTP2_CLIENT_CONNECT_STRING)));
+    output_buf.Append(
+        Slice::FromCopiedString(GRPC_CHTTP2_CLIENT_CONNECT_STRING));
+    settings_->MaybeGetSettingsAndSettingsAckFrames(flow_control_, output_buf);
+    // TODO(tjagtap) [PH2][P2][Server] : This will be opposite for server. We
+    // must read before we write for the server. So the ReadLoop will be Spawned
+    // just after the constructor, and the write loop should be spawned only
+    // after the first SETTINGS frame is completely received.
+    //
+    // Because the client is expected to write before it reads, we spawn the
+    // ReadLoop of the client only after the first write is queued.
+    SpawnGuardedTransportParty("ReadLoop", UntilTransportClosed(ReadLoop()));
     is_first_write_ = false;
   }
-  MaybeGetSettingsFrame(output_buf);
-  ping_manager_.MaybeGetSerializedPingFrames(output_buf,
-                                             NextAllowedPingInterval());
+
+  // Order of Control Frames is important.
+  // 1. GOAWAY - This is first because if this is the final GoAway, then we may
+  //             not need to send anything else to the peer.
+  // 2. SETTINGS and SETTINGS ACK
+  // 3. PING and PING acks.
+  // 4. WINDOW_UPDATE
+  // 5. Custom gRPC security frame
+
+  goaway_manager_.MaybeGetSerializedGoawayFrame(output_buf);
+  http2::Http2ErrorCode apply_status =
+      settings_->MaybeReportAndApplyBufferedPeerSettings(event_engine_.get());
+  if (!goaway_manager_.IsImmediateGoAway() &&
+      apply_status == http2::Http2ErrorCode::kNoError) {
+    EnforceLatestIncomingSettings();
+    settings_->MaybeGetSettingsAndSettingsAckFrames(flow_control_, output_buf);
+    ping_manager_->MaybeGetSerializedPingFrames(output_buf,
+                                                NextAllowedPingInterval());
+    MaybeGetWindowUpdateFrames(output_buf);
+  }
   const uint64_t buffer_length = output_buf.Length();
-  return If(
-      buffer_length > 0,
-      [self = RefAsSubclass<Http2ClientTransport>(),
-       output_buf = std::move(output_buf), buffer_length]() mutable {
-        GRPC_HTTP2_CLIENT_DLOG
-            << "Http2ClientTransport WriteControlFrames Writing buffer of size "
-            << buffer_length << " to endpoint";
-        return self->endpoint_.Write(std::move(output_buf),
-                                     PromiseEndpoint::WriteArgs{});
-      },
-      [self = RefAsSubclass<Http2ClientTransport>(), buffer_length] {
-        self->ztrace_collector_->Append(
-            PromiseEndpointWriteTrace{buffer_length});
-        return absl::OkStatus();
-      });
+  ztrace_collector_->Append(PromiseEndpointWriteTrace{buffer_length});
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport WriteControlFrames Size : "
+                         << buffer_length;
+  return AssertResultType<absl::Status>(
+      If((buffer_length > 0 && apply_status == http2::Http2ErrorCode::kNoError),
+         [self = RefAsSubclass<Http2ClientTransport>(),
+          output_buf = std::move(output_buf)]() mutable {
+           return self->endpoint_.Write(std::move(output_buf),
+                                        GetWriteArgs(self->settings_->peer()));
+         },
+         [self = RefAsSubclass<Http2ClientTransport>(), apply_status]() {
+           if (apply_status != http2::Http2ErrorCode::kNoError) {
+             return self->HandleError(
+                 std::nullopt,
+                 Http2Status::Http2ConnectionError(
+                     apply_status, "Failed to apply incoming settings"));
+           }
+           return absl::OkStatus();
+         }));
 }
 
 void Http2ClientTransport::NotifyControlFramesWriteDone() {
   // Notify Control modules that we have sent the frames.
   // All notifications are expected to be synchronous.
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport NotifyControlFramesWriteDone";
-  ping_manager_.NotifyPingSent(ping_timeout_);
+  reader_state_.ResumeReadLoopIfPaused();
+  ping_manager_->NotifyPingSent();
+  goaway_manager_.NotifyGoawaySent();
+  MaybeSpawnWaitForSettingsTimeout();
 }
 
 auto Http2ClientTransport::SerializeAndWrite(std::vector<Http2Frame>&& frames) {
@@ -728,7 +1086,7 @@ auto Http2ClientTransport::SerializeAndWrite(std::vector<Http2Frame>&& frames) {
       [self = RefAsSubclass<Http2ClientTransport>(),
        output_buf = std::move(output_buf)]() mutable {
         return self->endpoint_.Write(std::move(output_buf),
-                                     PromiseEndpoint::WriteArgs{});
+                                     GetWriteArgs(self->settings_->peer()));
       },
       []() { return absl::OkStatus(); }));
 }
@@ -740,45 +1098,71 @@ Http2ClientTransport::DequeueStreamFrames(RefCountedPtr<Stream> stream) {
   // data frames when write_bytes_remaining_ is very low. As the
   // available transport tokens can only range from 0 to 2^31 - 1,
   // we are clamping the write_bytes_remaining_ to that range.
-  // TODO(akshitpatel) : [PH2][P3] : Plug transport_tokens when
-  // transport flow control is implemented.
+  const uint32_t tokens =
+      GetMaxPermittedDequeue(flow_control_, stream->flow_control,
+                             write_bytes_remaining_, settings_->peer());
+  const uint32_t stream_flow_control_tokens = static_cast<uint32_t>(
+      GetStreamFlowControlTokens(stream->flow_control, settings_->peer()));
+  stream->flow_control.ReportIfStalled(
+      /*is_client=*/true, stream->GetStreamId(), settings_->peer());
   StreamDataQueue<ClientMetadataHandle>::DequeueResult result =
-      stream->DequeueFrames(
-          /*transport_tokens*/ std::min(
-              std::numeric_limits<uint32_t>::max(),
-              static_cast<uint32_t>(Clamp<size_t>(write_bytes_remaining_, 0,
-                                                  RFC9113::kMaxSize31Bit - 1))),
-          settings_.peer().max_frame_size(), encoder_);
+      stream->DequeueFrames(tokens, stream_flow_control_tokens,
+                            settings_->peer().max_frame_size(), encoder_);
+  ProcessOutgoingDataFrameFlowControl(stream->flow_control,
+                                      result.flow_control_tokens_consumed);
   if (result.is_writable) {
     // Stream is still writable. Enqueue it back to the writable
     // stream list.
-    // TODO(akshitpatel) : [PH2][P3] : Plug transport_tokens when
-    // transport flow control is implemented.
-    absl::Status status =
-        writable_stream_list_.Enqueue(stream, result.priority);
+    absl::Status status = writable_stream_list_.EnqueueWrapper(
+        stream, result.priority, AreTransportFlowControlTokensAvailable());
+
     if (GPR_UNLIKELY(!status.ok())) {
       GRPC_HTTP2_CLIENT_DLOG
-          << "Http2ClientTransport MultiplexerLoop Failed to "
+          << "Http2ClientTransport DequeueStreamFrames Failed to "
              "enqueue stream "
           << stream->GetStreamId() << " with status: " << status;
       // Close transport if we fail to enqueue stream.
-      return HandleError(std::nullopt, Http2Status::AbslConnectionError(
-                                           absl::StatusCode::kUnavailable,
-                                           std::string(status.message())));
+      return HandleError(std::nullopt, ToHttpOkOrConnError(status));
     }
   }
+
+  // If the stream is aborted before initial metadata is dequeued, we will
+  // not dequeue any frames from the stream data queue (including RST_STREAM).
+  // Because of this, we will add the stream to the stream_list only when
+  // we are guaranteed to send initial metadata on the wire. If the above
+  // mentioned scenario occurs, the stream ref will be dropped by the
+  // multiplexer loop as the stream will never be writable again. Additionally,
+  // the other two stream refs, CallHandler OnDone and OutboundLoop will be
+  // dropped by Callv3 triggering cleaning up the stream object.
   if (result.InitialMetadataDequeued()) {
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport DequeueStreamFrames InitialMetadataDequeued "
+           "stream_id = "
+        << stream->GetStreamId();
     stream->SentInitialMetadata();
+    // After this point, initial metadata is guaranteed to be sent out.
+    AddToStreamList(stream);
   }
+
   if (result.HalfCloseDequeued()) {
-    CloseStream(stream, CloseStreamArgs{/*close_reads=*/false,
-                                        /*close_writes=*/true});
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport DequeueStreamFrames HalfCloseDequeued "
+           "stream_id = "
+        << stream->GetStreamId();
     stream->MarkHalfClosedLocal();
+    CloseStream(
+        stream,
+        CloseStreamArgs{/*close_reads=*/stream->did_receive_trailing_metadata,
+                        /*close_writes=*/true});
   }
   if (result.ResetStreamDequeued()) {
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport DequeueStreamFrames ResetStreamDequeued "
+           "stream_id = "
+        << stream->GetStreamId();
+    stream->MarkHalfClosedLocal();
     CloseStream(stream, CloseStreamArgs{/*close_reads=*/true,
                                         /*close_writes=*/true});
-    stream->MarkHalfClosedLocal();
   }
 
   // Update the write_bytes_remaining_ based on the bytes consumed
@@ -787,7 +1171,7 @@ Http2ClientTransport::DequeueStreamFrames(RefCountedPtr<Stream> stream) {
       (write_bytes_remaining_ >= result.total_bytes_consumed)
           ? (write_bytes_remaining_ - result.total_bytes_consumed)
           : 0;
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport MultiplexerLoop "
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport DequeueStreamFrames "
                             "write_bytes_remaining_ after dequeue = "
                          << write_bytes_remaining_ << " total_bytes_consumed = "
                          << result.total_bytes_consumed
@@ -799,6 +1183,8 @@ Http2ClientTransport::DequeueStreamFrames(RefCountedPtr<Stream> stream) {
   return std::move(result.frames);
 }
 
+// This MultiplexerLoop promise is responsible for Multiplexing multiple gRPC
+// Requests (HTTP2 Streams) and writing them into one common endpoint.
 auto Http2ClientTransport::MultiplexerLoop() {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport MultiplexerLoop Factory";
   return AssertResultType<
@@ -814,17 +1200,19 @@ auto Http2ClientTransport::MultiplexerLoop() {
           // WriteControlFrames() to indicate if we should do a separate write
           // for the queued control frames or send the queued frames with the
           // data frames(if any).
-          return Map(self->WriteControlFrames(), [self](absl::Status status) {
-            if (GPR_UNLIKELY(!status.ok())) {
-              GRPC_HTTP2_CLIENT_DLOG
-                  << "Http2ClientTransport MultiplexerLoop Failed to "
-                     "write control frames with status: "
-                  << status;
-              return status;
-            }
-            self->NotifyControlFramesWriteDone();
-            return absl::OkStatus();
-          });
+          return Map(
+              self->ProcessAndWriteControlFrames(),
+              [self](absl::Status status) {
+                if (GPR_UNLIKELY(!status.ok())) {
+                  GRPC_HTTP2_CLIENT_DLOG
+                      << "Http2ClientTransport MultiplexerLoop Failed to "
+                         "write control frames with status: "
+                      << status;
+                  return status;
+                }
+                self->NotifyControlFramesWriteDone();
+                return absl::OkStatus();
+              });
         },
         [self]() -> absl::StatusOr<std::vector<Http2Frame>> {
           std::vector<Http2Frame> frames;
@@ -833,8 +1221,6 @@ auto Http2ClientTransport::MultiplexerLoop() {
           // some cases, we may write more than max_write_size_ bytes(like
           // writing metadata).
           while (self->write_bytes_remaining_ > 0) {
-            // TODO(akshitpatel) : [PH2][P3] : Plug transport_tokens when
-            // transport flow control is implemented.
             std::optional<RefCountedPtr<Stream>> optional_stream =
                 self->writable_stream_list_.ImmediateNext(
                     self->AreTransportFlowControlTokensAvailable());
@@ -852,8 +1238,28 @@ auto Http2ClientTransport::MultiplexerLoop() {
                 << stream->GetStreamId()
                 << " is_closed_for_writes = " << stream->IsClosedForWrites();
 
+            if (stream->GetStreamId() == kInvalidStreamId) {
+              GRPC_DCHECK(stream->IsStreamIdle());
+              // TODO(akshitpatel) : [PH2][P5] : We will waste a stream id in
+              // the rare scenario where the stream is aborted before it can be
+              // written to. This is a possible area to optimize in future.
+              absl::Status status = self->InitializeStream(stream);
+              if (!status.ok()) {
+                GRPC_HTTP2_CLIENT_DLOG
+                    << "Http2ClientTransport MultiplexerLoop "
+                       "Failed to assign stream id and add to stream list for "
+                       "stream: "
+                    << stream.get() << " closing this stream.";
+                self->BeginCloseStream(
+                    stream, /*reset_stream_error_code=*/std::nullopt,
+                    CancelledServerMetadataFromStatus(status));
+                continue;
+              }
+            }
+
             if (GPR_LIKELY(!stream->IsClosedForWrites())) {
-              auto stream_frames = self->DequeueStreamFrames(stream);
+              absl::StatusOr<std::vector<Http2Frame>> stream_frames =
+                  self->DequeueStreamFrames(stream);
               if (GPR_UNLIKELY(!stream_frames.ok())) {
                 GRPC_HTTP2_CLIENT_DLOG
                     << "Http2ClientTransport MultiplexerLoop "
@@ -884,7 +1290,7 @@ auto Http2ClientTransport::MultiplexerLoop() {
           if (self->should_reset_ping_clock_) {
             GRPC_HTTP2_CLIENT_DLOG
                 << "Http2ClientTransport MultiplexerLoop ResetPingClock";
-            self->ping_manager_.ResetPingClock(/*is_client=*/true);
+            self->ping_manager_->ResetPingClock(/*is_client=*/true);
             self->should_reset_ping_clock_ = false;
           }
           return Continue();
@@ -892,18 +1298,102 @@ auto Http2ClientTransport::MultiplexerLoop() {
   }));
 }
 
-auto Http2ClientTransport::OnMultiplexerLoopEnded() {
-  GRPC_HTTP2_CLIENT_DLOG
-      << "Http2ClientTransport OnMultiplexerLoopEnded Factory";
-  return
-      [self = RefAsSubclass<Http2ClientTransport>()](absl::Status status) {
-        GRPC_HTTP2_CLIENT_DLOG
-            << "Http2ClientTransport OnMultiplexerLoopEnded Promise Status="
-            << status;
-        GRPC_UNUSED absl::Status error = self->HandleError(
-            std::nullopt, Http2Status::AbslConnectionError(
-                              status.code(), std::string(status.message())));
-      };
+absl::Status Http2ClientTransport::InitializeStream(
+    RefCountedPtr<Stream> stream) {
+  absl::StatusOr<uint32_t> next_stream_id = NextStreamId();
+  if (!next_stream_id.ok()) {
+    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport InitializeStream "
+                              "Failed to get next stream id for stream: "
+                           << stream.get();
+    return std::move(next_stream_id).status();
+  }
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport InitializeStream "
+                            "Assigned stream id: "
+                         << next_stream_id.value()
+                         << " to stream: " << stream.get()
+                         << ", allow_true_binary_metadata:"
+                         << settings_->peer().allow_true_binary_metadata();
+  stream->InitializeStream(next_stream_id.value(),
+                           settings_->peer().allow_true_binary_metadata(),
+                           settings_->acked().allow_true_binary_metadata());
+  return absl::OkStatus();
+}
+
+void Http2ClientTransport::AddToStreamList(RefCountedPtr<Stream> stream) {
+  bool should_wake_periodic_updates = false;
+  {
+    MutexLock lock(&transport_mutex_);
+    GRPC_DCHECK(stream != nullptr) << "stream is null";
+    GRPC_DCHECK_GT(stream->GetStreamId(), 0u) << "stream id is invalid";
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport AddToStreamList for stream id: "
+        << stream->GetStreamId();
+    stream_list_.emplace(stream->GetStreamId(), stream);
+    // TODO(tjagtap) [PH2][P2][BDP] Remove this when the BDP code is done.
+    if (GetActiveStreamCountLocked() == 1) {
+      should_wake_periodic_updates = true;
+    }
+  }
+  // TODO(tjagtap) [PH2][P2][BDP] Remove this when the BDP code is done.
+  if (should_wake_periodic_updates) {
+    // Release the lock before you wake up another promise on the party.
+    WakeupPeriodicUpdatePromise();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Settings and Window Update Management
+
+void Http2ClientTransport::EnforceLatestIncomingSettings() {
+  encoder_.SetMaxTableSize(settings_->peer().header_table_size());
+}
+
+auto Http2ClientTransport::WaitForSettingsTimeoutOnDone() {
+  return [self = RefAsSubclass<Http2ClientTransport>()](absl::Status status) {
+    if (!status.ok()) {
+      GRPC_UNUSED absl::Status result = self->HandleError(
+          std::nullopt, Http2Status::Http2ConnectionError(
+                            Http2ErrorCode::kProtocolError,
+                            std::string(RFC9113::kSettingsTimeout)));
+    }
+  };
+}
+
+void Http2ClientTransport::MaybeSpawnWaitForSettingsTimeout() {
+  if (settings_->ShouldSpawnWaitForSettingsTimeout()) {
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport::MaybeSpawnWaitForSettingsTimeout Spawning";
+    general_party_->Spawn("WaitForSettingsTimeout",
+                          settings_->WaitForSettingsTimeout(),
+                          WaitForSettingsTimeoutOnDone());
+  }
+}
+
+void Http2ClientTransport::MaybeGetWindowUpdateFrames(SliceBuffer& output_buf) {
+  std::vector<Http2Frame> frames;
+  frames.reserve(window_update_list_.size() + 1);
+  uint32_t window_size =
+      flow_control_.DesiredAnnounceSize(/*writing_anyway=*/true);
+  if (window_size > 0) {
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport::MaybeGetWindowUpdateFrames Transport Window "
+           "Update : "
+        << window_size;
+    frames.emplace_back(Http2WindowUpdateFrame{/*stream_id=*/0, window_size});
+    flow_control_.SentUpdate(window_size);
+  }
+  for (const uint32_t stream_id : window_update_list_) {
+    RefCountedPtr<Stream> stream = LookupStream(stream_id);
+    MaybeAddStreamWindowUpdateFrame(stream, frames);
+  }
+  window_update_list_.clear();
+  if (!frames.empty()) {
+    GRPC_HTTP2_CLIENT_DLOG
+        << "Http2ClientTransport::MaybeGetWindowUpdateFrames Total Window "
+           "Update Frames : "
+        << frames.size();
+    Serialize(absl::Span<Http2Frame>(frames), output_buf);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -912,54 +1402,20 @@ auto Http2ClientTransport::OnMultiplexerLoopEnded() {
 Http2ClientTransport::Http2ClientTransport(
     PromiseEndpoint endpoint, GRPC_UNUSED const ChannelArgs& channel_args,
     std::shared_ptr<EventEngine> event_engine,
-    grpc_closure* on_receive_settings)
+    absl::AnyInvocable<void(absl::StatusOr<uint32_t>)> on_receive_settings)
     : channelz::DataSource(http2::CreateChannelzSocketNode(
           endpoint.GetEventEngineEndpoint(), channel_args)),
+      event_engine_(std::move(event_engine)),
       endpoint_(std::move(endpoint)),
-      stream_id_mutex_(/*Initial Stream Id*/ 1),
+      settings_(MakeRefCounted<SettingsPromiseManager>(
+          std::move(on_receive_settings))),
+      next_stream_id_(/*Initial Stream ID*/ 1),
       should_reset_ping_clock_(false),
-      incoming_header_in_progress_(false),
-      incoming_header_end_stream_(false),
       is_first_write_(true),
-      incoming_header_stream_id_(0),
-      on_receive_settings_(on_receive_settings),
-      max_header_list_size_soft_limit_(
-          GetSoftLimitFromChannelArgs(channel_args)),
       max_write_size_(kMaxWriteSize),
-      keepalive_time_(std::max(
-          Duration::Seconds(10),
-          channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIME_MS)
-              .value_or(Duration::Infinity()))),
-      // Keepalive timeout is only passed to the keepalive manager if it is less
-      // than the ping timeout. As keepalives use pings for health checks, if
-      // keepalive timeout is greater than ping timeout, we would always hit the
-      // ping timeout first.
-      keepalive_timeout_(std::max(
-          Duration::Zero(),
-          channel_args.GetDurationFromIntMillis(GRPC_ARG_KEEPALIVE_TIMEOUT_MS)
-              .value_or(keepalive_time_ == Duration::Infinity()
-                            ? Duration::Infinity()
-                            : (Duration::Seconds(20))))),
-      ping_timeout_(std::max(
-          Duration::Zero(),
-          channel_args.GetDurationFromIntMillis(GRPC_ARG_PING_TIMEOUT_MS)
-              .value_or(keepalive_time_ == Duration::Infinity()
-                            ? Duration::Infinity()
-                            : Duration::Minutes(1)))),
-      ping_manager_(channel_args, PingSystemInterfaceImpl::Make(this),
-                    event_engine),
-      keepalive_manager_(
-          KeepAliveInterfaceImpl::Make(this),
-          ((keepalive_timeout_ < ping_timeout_) ? keepalive_timeout_
-                                                : Duration::Infinity()),
-          keepalive_time_),
-      keepalive_permit_without_calls_(
-          channel_args.GetBool(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS)
-              .value_or(false)),
-      enable_preferred_rx_crypto_frame_advertisement_(
-          channel_args
-              .GetBool(GRPC_ARG_EXPERIMENTAL_HTTP2_PREFERRED_CRYPTO_FRAME_SIZE)
-              .value_or(false)),
+      ping_manager_(std::nullopt),
+      keepalive_manager_(std::nullopt),
+      goaway_manager_(GoawayInterfaceImpl::Make(this)),
       memory_owner_(channel_args.GetObject<ResourceQuota>()
                         ->memory_quota()
                         ->CreateMemoryOwner()),
@@ -969,165 +1425,274 @@ Http2ClientTransport::Http2ClientTransport(
           &memory_owner_),
       ztrace_collector_(std::make_shared<PromiseHttp2ZTraceCollector>()) {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Constructor Begin";
-  SourceConstructed();
+  // Initialize the general party and write party.
+  RefCountedPtr<Arena> party_arena = SimpleArenaAllocator(0)->MakeArena();
+  party_arena->SetContext<EventEngine>(event_engine_.get());
+  general_party_ = Party::Make(std::move(party_arena));
 
-  InitLocalSettings(settings_.mutable_local(), /*is_client=*/true);
-  ReadSettingsFromChannelArgs(channel_args, settings_.mutable_local(),
-                              flow_control_, /*is_client=*/true);
+  InitLocalSettings(settings_->mutable_local(), /*is_client=*/true);
+  TransportChannelArgs args;
+  ReadChannelArgs(channel_args, args);
 
-  // Initialize the general party and write party.
-  auto general_party_arena = SimpleArenaAllocator(0)->MakeArena();
-  general_party_arena->SetContext<EventEngine>(event_engine.get());
-  general_party_ = Party::Make(std::move(general_party_arena));
-
-  general_party_->Spawn("ReadLoop", UntilTransportClosed(ReadLoop()),
-                        OnReadLoopEnded());
-  general_party_->Spawn("MultiplexerLoop",
-                        UntilTransportClosed(MultiplexerLoop()),
-                        OnMultiplexerLoopEnded());
-  // The keepalive loop is only spawned if the keepalive time is not infinity.
-  keepalive_manager_.Spawn(general_party_.get());
-
-  // TODO(tjagtap) : [PH2][P2] Delete this hack once flow control is done.
-  // We are increasing the flow control window so that we can avoid sending
-  // WINDOW_UPDATE frames while flow control is under development. Once it is
-  // ready we should remove these lines.
-  // <DeleteAfterFlowControl>
-  Http2ErrorCode code = settings_.mutable_local().Apply(
-      Http2Settings::kInitialWindowSizeWireId,
-      (Http2Settings::max_initial_window_size() - 1));
-  GRPC_DCHECK(code == Http2ErrorCode::kNoError);
-  // </DeleteAfterFlowControl>
-
-  const int max_hpack_table_size =
-      channel_args.GetInt(GRPC_ARG_HTTP2_HPACK_TABLE_SIZE_ENCODER).value_or(-1);
-  if (max_hpack_table_size >= 0) {
-    encoder_.SetMaxUsableSize(max_hpack_table_size);
-  }
+  ping_manager_.emplace(channel_args, args.ping_timeout,
+                        PingSystemInterfaceImpl::Make(this), event_engine_);
 
-  transport_settings_.SetSettingsTimeout(channel_args, keepalive_timeout_);
+  // The keepalive loop is only spawned if the keepalive time is not infinity.
+  keepalive_manager_.emplace(
+      KeepAliveInterfaceImpl::Make(this),
+      ((args.keepalive_timeout < args.ping_timeout) ? args.keepalive_timeout
+                                                    : Duration::Infinity()),
+      args.keepalive_time, general_party_.get());
 
-  if (settings_.local().allow_security_frame()) {
+  if (settings_->local().allow_security_frame()) {
     // TODO(tjagtap) : [PH2][P3] : Setup the plumbing to pass the security frame
     // to the endpoing via TransportFramingEndpointExtension.
     // Also decide if this plumbing is done here, or when the peer sends
     // allow_security_frame too.
   }
 
-  // Spawn a promise to flush the gRPC initial connection string and settings
-  // frames.
-  general_party_->Spawn("SpawnFlushInitialFrames", TriggerWriteCycle(),
-                        [](GRPC_UNUSED absl::Status status) {});
-
+  GRPC_DCHECK(ping_manager_.has_value());
+  GRPC_DCHECK(keepalive_manager_.has_value());
+  SourceConstructed();
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Constructor End";
 }
 
+void Http2ClientTransport::SpawnTransportLoops() {
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::SpawnTransportLoops Begin";
+  SpawnGuardedTransportParty(
+      "FlowControlPeriodicUpdateLoop",
+      UntilTransportClosed(FlowControlPeriodicUpdateLoop()));
+
+  SpawnGuardedTransportParty("FlushInitialFrames", TriggerWriteCycle());
+  SpawnGuardedTransportParty("MultiplexerLoop",
+                             UntilTransportClosed(MultiplexerLoop()));
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::SpawnTransportLoops End";
+}
+
+void Http2ClientTransport::ReadChannelArgs(const ChannelArgs& channel_args,
+                                           TransportChannelArgs& args) {
+  http2::ReadChannelArgs(channel_args, args, settings_->mutable_local(),
+                         flow_control_,
+                         /*is_client=*/true);
+
+  // Assign the channel args to the member variables.
+  keepalive_time_ = args.keepalive_time;
+  incoming_headers_.set_soft_limit(args.max_header_list_size_soft_limit);
+  keepalive_permit_without_calls_ = args.keepalive_permit_without_calls;
+  enable_preferred_rx_crypto_frame_advertisement_ =
+      args.enable_preferred_rx_crypto_frame_advertisement;
+  test_only_ack_pings_ = args.test_only_ack_pings;
+
+  if (args.initial_sequence_number > 0) {
+    next_stream_id_ = args.initial_sequence_number;
+  }
+
+  settings_->SetSettingsTimeout(args.settings_timeout);
+  if (args.max_usable_hpack_table_size >= 0) {
+    encoder_.SetMaxUsableSize(args.max_usable_hpack_table_size);
+  }
+}
+
 // This function MUST be idempotent. This function MUST be called from the
 // transport party.
 void Http2ClientTransport::CloseStream(RefCountedPtr<Stream> stream,
                                        CloseStreamArgs args,
                                        DebugLocation whence) {
-  // TODO(akshitpatel) : [PH2][P3] : Measure the impact of holding mutex
-  // throughout this function.
-  MutexLock lock(&transport_mutex_);
-  GRPC_DCHECK(stream != nullptr) << "stream is null";
-  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::CloseStream for stream id: "
-                         << stream->GetStreamId()
-                         << " location=" << whence.file() << ":"
-                         << whence.line();
+  std::optional<Http2Status> close_transport_error;
 
-  if (args.close_writes) {
-    stream->SetWriteClosed();
-  }
-
-  if (args.close_reads) {
+  {
+    // TODO(akshitpatel) : [PH2][P3] : Measure the impact of holding mutex
+    // throughout this function.
+    MutexLock lock(&transport_mutex_);
+    GRPC_DCHECK(stream != nullptr) << "stream is null";
     GRPC_HTTP2_CLIENT_DLOG
         << "Http2ClientTransport::CloseStream for stream id: "
-        << stream->GetStreamId() << " closing stream for reads.";
-    stream_list_.erase(stream->GetStreamId());
+        << stream->GetStreamId() << " close_reads=" << args.close_reads
+        << " close_writes=" << args.close_writes
+        << " incoming_headers_=" << incoming_headers_.DebugString()
+        << " location=" << whence.file() << ":" << whence.line();
+
+    if (args.close_writes) {
+      stream->SetWriteClosed();
+    }
+
+    if (args.close_reads) {
+      GRPC_HTTP2_CLIENT_DLOG
+          << "Http2ClientTransport::CloseStream for stream id: "
+          << stream->GetStreamId() << " closing stream for reads.";
+      // If the stream is closed while reading HEADER/CONTINUATION frames, we
+      // should still parse the enqueued buffer to maintain HPACK state between
+      // peers.
+      if (incoming_headers_.IsWaitingForContinuationFrame()) {
+        Http2Status result = http2::ParseAndDiscardHeaders(
+            parser_, SliceBuffer(),
+            HeaderAssembler::ParseHeaderArgs{
+                /*is_initial_metadata=*/!incoming_headers_.HeaderHasEndStream(),
+                /*is_end_headers=*/false,
+                /*is_client=*/true,
+                /*max_header_list_size_soft_limit=*/
+                incoming_headers_.soft_limit(),
+                /*max_header_list_size_hard_limit=*/
+                settings_->acked().max_header_list_size(),
+                /*stream_id=*/incoming_headers_.GetStreamId(),
+            },
+            stream, /*original_status=*/Http2Status::Ok());
+        if (result.GetType() == Http2Status::Http2ErrorType::kConnectionError) {
+          GRPC_HTTP2_CLIENT_DLOG
+              << "Http2ClientTransport::CloseStream for stream id: "
+              << stream->GetStreamId()
+              << " failed to partially process header: "
+              << result.DebugString();
+          close_transport_error.emplace(std::move(result));
+        }
+      }
+
+      stream_list_.erase(stream->GetStreamId());
+      if (!close_transport_error.has_value() && CanCloseTransportLocked()) {
+        // TODO(akshitpatel) : [PH2][P3] : Is kInternalError the right error
+        // code to use here? IMO it should be kNoError.
+        close_transport_error.emplace(Http2Status::Http2ConnectionError(
+            Http2ErrorCode::kInternalError,
+            std::string(RFC9113::kLastStreamClosed)));
+      }
+    }
+  }
+
+  if (close_transport_error.has_value()) {
+    GRPC_UNUSED absl::Status status = HandleError(
+        /*stream_id=*/std::nullopt, std::move(*close_transport_error));
   }
 }
 
-// Here is the flow for stream close:
-// 1. BeginCloseStream is invoked if the transport needs to close the stream.
-// 2. If reset stream does not need to be sent, the stream is closed for reads
-//    and writes immediately. Also, the stream is removed from the
-//    stream_list_.
-// 3. If reset stream needs to be sent and the stream is cancelled, the stream
-//    is closed for reads immediately. This will result in stream being removed
-//    from the stream_list_. Additionally, the reset stream frame is enqueued
-//    and the stream is closed for writes once the frame is created.
-// 4. Trailing metadata is pushed to the call stack.
-// Extended:
-// 5. Eventually CallHandler.OnDone() is invoked.
-// 6. If the call was cancelled, we try to enqueue a reset stream frame. In most
-//    of the cases, this would be a no-op. The only case where this would
-//    enqueue the reset stream frame is an application initiated abort.
-// 7. If the call was not cancelled, we try to enqueue a half close frame. If
-//    the stream was already closed from writes, this would be a no-op.
+// This function is idempotent and MUST be called from the transport party.
+// All the scenarios that can lead to this function being called are:
+// 1. Reading a RST stream frame: In this case, the stream is immediately
+//    closed for reads and writes and removed from the stream_list_.
+// 2. Reading a Trailing Metadata frame: There are two possible scenarios:
+//    a. The stream is closed for writes: Close the stream for reads and writes
+//       and remove the stream from the stream_list_.
+//    b. The stream is NOT closed for writes: Stream is kept open for reads and
+//       writes. CallHandler OnDone will trigger sending a half close frame. If
+//       before the multiplexer loop triggers sending a half close a RST stream
+//       is read, the stream is closed for reads and writes immediately and the
+//       half close is discarded. If no RST stream is read, the stream is closed
+//       for reads and writes upon sending the half close frame from the
+//       multiplexer loop.
+// 3. Hitting error condition in the transport: In this case, RST stream is
+//    enqueued and the stream is closed for reads immediately. This implies we
+//    reduce the number of active streams inline. When multiplexer loop
+//    processes the RST stream frame, the stream ref will dropped. The other
+//    stream ref will be dropped when CallHandler's OnDone is executed causing
+//    the stream to be destroyed. CallHandlers OnDone also tries to enqueue a
+//    RST stream frame. This is a no-op at this point.
+// 4. Application abort: In this case, CallHandler OnDone will enqueue RST
+//    stream frame to the stream data queue. The multiplexer loop will send the
+//    reset stream frame and close the stream from reads and writes.
+// 5. Transport close: This takes up the same path as case 3.
+// In all the above cases, trailing metadata is pushed to the call spine.
+// Note: The stream ref is held in atmost 3 places:
+// 1. stream_list_ : This is released when the stream is closed for reads.
+// 2. CallHandler OnDone : This is released when Trailing Metadata is pushed to
+//    the call spine.
+// 3. List of writable streams : This is released after the final frame is
+//    dequeued from the StreamDataQueue.
 void Http2ClientTransport::BeginCloseStream(
-    const uint32_t stream_id, std::optional<uint32_t> reset_stream_error_code,
+    RefCountedPtr<Stream> stream,
+    std::optional<uint32_t> reset_stream_error_code,
     ServerMetadataHandle&& metadata, DebugLocation whence) {
+  if (stream == nullptr) {
+    GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::BeginCloseStream stream "
+                              "is null reset_stream_error_code="
+                           << (reset_stream_error_code.has_value()
+                                   ? absl::StrCat(*reset_stream_error_code)
+                                   : "nullopt")
+                           << " metadata=" << metadata->DebugString();
+    return;
+  }
+
   GRPC_HTTP2_CLIENT_DLOG
-      << "Http2ClientTransport::BeginCloseStream for stream id: " << stream_id
-      << " error_code="
+      << "Http2ClientTransport::BeginCloseStream for stream id: "
+      << stream->GetStreamId() << " error_code="
       << (reset_stream_error_code.has_value()
               ? absl::StrCat(*reset_stream_error_code)
               : "nullopt")
       << " ServerMetadata=" << metadata->DebugString()
       << " location=" << whence.file() << ":" << whence.line();
 
-  RefCountedPtr<Stream> stream = LookupStream(stream_id);
-  if (stream != nullptr) {
-    if (stream->did_push_trailing_metadata) {
-      return;
-    }
-
-    // If reset stream needs to be sent, CloseStream will be called from the
-    // Multiplexer after the reset stream frame is created.
+  bool close_reads = false;
+  bool close_writes = false;
+  if (metadata->get(GrpcCallWasCancelled())) {
     if (!reset_stream_error_code) {
       // Callers taking this path:
       // 1. Reading a RST stream frame (will not send any frame out).
-
-      CloseStream(stream,
-                  CloseStreamArgs{/*close_reads*/ true, /*close_writes=*/true},
-                  whence);
-      stream->MarkHalfClosedRemote();
+      // 2. Closing a stream before initial metadata is sent.
+      close_reads = true;
+      close_writes = true;
+      GRPC_HTTP2_CLIENT_DLOG
+          << "Http2ClientTransport::BeginCloseStream for stream id: "
+          << stream->GetStreamId() << " close_reads= " << close_reads
+          << " close_writes= " << close_writes;
     } else {
       // Callers taking this path:
-      // 1. Reading Trailing Metadata (MAY send half close from OnDone).
-      // 2. Processing Error in transport (will send reset stream from here).
-
-      if (metadata->get(GrpcCallWasCancelled())) {
-        CloseStream(
-            stream,
-            CloseStreamArgs{/*close_reads*/ true, /*close_writes=*/false},
-            whence);
-        absl::StatusOr<EnqueueResult> enqueue_result =
-            stream->EnqueueResetStream(reset_stream_error_code.value());
-        GRPC_HTTP2_CLIENT_DLOG << "Enqueued ResetStream with error code="
-                               << reset_stream_error_code.value()
-                               << " status=" << enqueue_result.status();
-        if (enqueue_result.ok()) {
-          GRPC_UNUSED absl::Status status = MaybeAddStreamToWritableStreamList(
-              stream, enqueue_result.value());
-        }
+      // 1. Processing Error in transport (will send reset stream from here).
+      absl::StatusOr<StreamWritabilityUpdate> enqueue_result =
+          stream->EnqueueResetStream(reset_stream_error_code.value());
+      GRPC_HTTP2_CLIENT_DLOG << "Enqueued ResetStream with error code="
+                             << reset_stream_error_code.value()
+                             << " status=" << enqueue_result.status();
+      if (enqueue_result.ok()) {
+        GRPC_UNUSED absl::Status status =
+            MaybeAddStreamToWritableStreamList(stream, enqueue_result.value());
       }
+      close_reads = true;
+      GRPC_HTTP2_CLIENT_DLOG
+          << "Http2ClientTransport::BeginCloseStream for stream id: "
+          << stream->GetStreamId() << " close_reads= " << close_reads
+          << " close_writes= " << close_writes;
     }
+  } else {
+    // Callers taking this path:
+    // 1. Reading Trailing Metadata (MAY send half close from OnDone).
+    if (stream->IsClosedForWrites()) {
+      close_reads = true;
+      close_writes = true;
+      GRPC_HTTP2_CLIENT_DLOG
+          << "Http2ClientTransport::BeginCloseStream for stream id: "
+          << stream->GetStreamId() << " close_reads= " << close_reads
+          << " close_writes= " << close_writes;
+    }
+  }
 
-    stream->did_push_trailing_metadata = true;
-    // This maybe called multiple times while closing a stream. This should be
-    // fine as the the call spine ignores the subsequent calls.
-    stream->call.SpawnPushServerTrailingMetadata(std::move(metadata));
+  if (close_reads || close_writes) {
+    CloseStream(stream, CloseStreamArgs{close_reads, close_writes}, whence);
   }
+
+  // If the call was cancelled, the stream MUST be closed for reads.
+  GRPC_DCHECK(metadata->get(GrpcCallWasCancelled()) ? close_reads : true);
+
+  // This maybe called multiple times while closing a stream. In CallV3, the
+  // flow for pushing server trailing metadata is idempotent. However, there is
+  // a subtle difference. When we push server trailing metadata with a cancelled
+  // status PushServerTrailingMetadata is spawned inline on the Call party
+  // whereas for the non-cancelled status, PushServerTrailingMetadata is
+  // spawned in the server_to_client spawn serializer. Because of this, in
+  // case when the server pushes trailing metadata (non-cancelled) followed by a
+  // RST stream with cancelled status, it is possible that the cancelled
+  // trailing metadata (for RST stream) is processed before. This would result
+  // in losing the actual status/message pushed by the server.
+  // To address this, we push the server trailing metadata to the stream only
+  // if it is not pushed already.
+  stream->MaybePushServerTrailingMetadata(std::move(metadata));
 }
 
 void Http2ClientTransport::CloseTransport() {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::CloseTransport";
 
   transport_closed_latch_.Set();
-  // This is the only place where the general_party_ is
-  // reset.
+  settings_->HandleTransportShutdown(event_engine_.get());
+
+  MutexLock lock(&transport_mutex_);
+  // This is the only place where the general_party_ is reset.
   general_party_.reset();
 }
 
@@ -1153,16 +1718,15 @@ void Http2ClientTransport::MaybeSpawnCloseTransport(Http2Status http2_status,
   absl::flat_hash_map<uint32_t, RefCountedPtr<Stream>> stream_list =
       std::move(stream_list_);
   stream_list_.clear();
-  state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN,
-                          http2_status.GetAbslConnectionError(),
-                          "transport closed");
+  ReportDisconnectionLocked(
+      http2_status.GetAbslConnectionError(), {},
+      absl::StrCat("Transport closed: ", http2_status.DebugString()).c_str());
   lock.Release();
 
-  general_party_->Spawn(
-      "CloseTransport",
-      [self = RefAsSubclass<Http2ClientTransport>(),
-       stream_list = std::move(stream_list),
-       http2_status = std::move(http2_status)]() mutable {
+  SpawnInfallibleTransportParty(
+      "CloseTransport", [self = RefAsSubclass<Http2ClientTransport>(),
+                         stream_list = std::move(stream_list),
+                         http2_status = std::move(http2_status)]() mutable {
         GRPC_HTTP2_CLIENT_DLOG
             << "Http2ClientTransport::CloseTransport Cleaning up call stacks";
         // Clean up the call stacks for all active streams.
@@ -1172,8 +1736,8 @@ void Http2ClientTransport::MaybeSpawnCloseTransport(Http2Status http2_status,
           // fail. Also, as this is running on the transport
           // party, there would not be concurrent access to the stream.
           auto& stream = pair.second;
-          self->BeginCloseStream(stream->stream_id,
-                                 Http2ErrorCodeToRstFrameErrorCode(
+          self->BeginCloseStream(stream,
+                                 Http2ErrorCodeToFrameErrorCode(
                                      http2_status.GetConnectionErrorCode()),
                                  CancelledServerMetadataFromStatus(
                                      http2_status.GetAbslConnectionError()));
@@ -1183,38 +1747,115 @@ void Http2ClientTransport::MaybeSpawnCloseTransport(Http2Status http2_status,
         // the connection; a receiver of a GOAWAY that has no more use for the
         // connection SHOULD still send a GOAWAY frame before terminating the
         // connection.
-        // TODO(akshitpatel) : [PH2][P2] : There would a timer for sending
-        // goaway here. Once goaway is sent or timer is expired, close the
-        // transport.
-        return Map(Immediate(absl::OkStatus()),
-                   [self](GRPC_UNUSED absl::Status) mutable {
-                     self->CloseTransport();
-                     return Empty{};
-                   });
-      },
-      [](Empty) {});
+        return Map(
+            // TODO(akshitpatel) : [PH2][P4] : This is creating a copy of
+            // the debug data. Verify if this is causing a performance
+            // issue.
+            Race(AssertResultType<absl::Status>(
+                     self->goaway_manager_.RequestGoaway(
+                         http2_status.GetConnectionErrorCode(),
+                         /*debug_data=*/
+                         Slice::FromCopiedString(
+                             http2_status.GetAbslConnectionError().message()),
+                         kLastIncomingStreamIdClient, /*immediate=*/true)),
+                 // Failsafe to close the transport if goaway is not
+                 // sent within kGoawaySendTimeoutSeconds seconds.
+                 Sleep(Duration::Seconds(kGoawaySendTimeoutSeconds))),
+            [self](auto) mutable {
+              self->CloseTransport();
+              return Empty{};
+            });
+        ;
+      });
+}
+
+bool Http2ClientTransport::CanCloseTransportLocked() const {
+  // If there are no more streams and next stream id is greater than the
+  // max allowed stream id, then no more streams can be created and it is
+  // safe to close the transport.
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::CanCloseTransportLocked "
+                            "GetActiveStreamCountLocked="
+                         << GetActiveStreamCountLocked()
+                         << " PeekNextStreamId=" << PeekNextStreamId()
+                         << " GetMaxAllowedStreamId="
+                         << GetMaxAllowedStreamId();
+  return GetActiveStreamCountLocked() == 0 &&
+         PeekNextStreamId() > GetMaxAllowedStreamId();
 }
 
 Http2ClientTransport::~Http2ClientTransport() {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Destructor Begin";
   GRPC_DCHECK(stream_list_.empty());
+  GRPC_DCHECK(general_party_ == nullptr);
   memory_owner_.Reset();
-  SourceDestructing();
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport Destructor End";
 }
 
+void Http2ClientTransport::SpawnAddChannelzData(RefCountedPtr<Party> party,
+                                                channelz::DataSink sink) {
+  SpawnInfallible(
+      std::move(party), "AddData",
+      [self = RefAsSubclass<Http2ClientTransport>(),
+       sink = std::move(sink)]() mutable {
+        GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::AddData Promise";
+        sink.AddData(
+            "Http2ClientTransport",
+            channelz::PropertyList()
+                .Set("keepalive_time", self->keepalive_time_)
+                .Set("keepalive_permit_without_calls",
+                     self->keepalive_permit_without_calls_)
+                .Set("settings", self->settings_->ChannelzProperties())
+                .Set("flow_control",
+                     self->flow_control_.stats().ChannelzProperties()));
+        self->general_party_->ExportToChannelz("Http2ClientTransport Party",
+                                               sink);
+        GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::AddData End";
+        return Empty{};
+      });
+}
+
 void Http2ClientTransport::AddData(channelz::DataSink sink) {
-  sink.AddData(
-      "Http2ClientTransport",
-      channelz::PropertyList()
-          .Set("settings", settings_.ChannelzProperties())
-          .Set("keepalive_time", keepalive_time_)
-          .Set("keepalive_timeout", keepalive_timeout_)
-          .Set("ping_timeout", ping_timeout_)
-          .Set("keepalive_permit_without_calls",
-               keepalive_permit_without_calls_)
-          .Set("flow_control", flow_control_.stats().ChannelzProperties()));
-  general_party_->ExportToChannelz("Http2ClientTransport Party", sink);
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport::AddData Begin";
+
+  event_engine_->Run([self = RefAsSubclass<Http2ClientTransport>(),
+                      sink = std::move(sink)]() mutable {
+    bool is_party_null = false;
+    {
+      // Apart from CloseTransport, this is the only place where a lock is taken
+      // to access general_party_. All other access to general_party_ happens
+      // on the general party itself and hence do not race with CloseTransport.
+      // TODO(akshitpatel) : [PH2][P4] : Check if a new mutex is needed to
+      // protect general_party_. Curently transport_mutex_ can is used in
+      // these places:
+      // 1. In promises running on the transport party
+      // 2. In AddData promise
+      // 3. In Orphan function.
+      // 4. Stream creation (this will be removed soon).
+      // Given that #1 is already serialized (guaranteed by party), #2 is on
+      // demand and #3 happens once for the lifetime of the transport while
+      // closing the transport, the contention should be minimal.
+      MutexLock lock(&self->transport_mutex_);
+      // TODO(akshitpatel) : [PH2][P2] : There is still a potential for a race
+      // here where the general_party_ is reset between the lock being
+      // released and the spawn. We cannot just do a spawn inside the mutex as
+      // that may result in deadlock.
+      // Potential fix to hold a ref to the party inside the mutex and do a
+      // spawn outside the mutex. The only side effect is that this introduces
+      // an additional ref to the party other the transport's copy.
+      if (GPR_UNLIKELY(self->general_party_ == nullptr)) {
+        is_party_null = true;
+        GRPC_HTTP2_CLIENT_DLOG
+            << "Http2ClientTransport::AddData general_party_ is "
+               "null. Transport is closed.";
+      }
+    }
+
+    ExecCtx exec_ctx;
+    if (!is_party_null) {
+      self->SpawnAddChannelzData(self->general_party_, std::move(sink));
+    }
+    self.reset();  // Cleanup with exec_ctx in scope
+  });
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1240,7 +1881,7 @@ bool Http2ClientTransport::SetOnDone(CallHandler call_handler,
         GRPC_HTTP2_CLIENT_DLOG << "PH2: Client call " << self.get()
                                << " id=" << stream_id
                                << " done: cancelled=" << cancelled;
-        absl::StatusOr<EnqueueResult> enqueue_result;
+        absl::StatusOr<StreamWritabilityUpdate> enqueue_result;
         GRPC_HTTP2_CLIENT_DLOG
             << "PH2: Client call " << self.get() << " id=" << stream_id
             << " done: stream=" << stream.get() << " cancelled=" << cancelled;
@@ -1262,6 +1903,12 @@ bool Http2ClientTransport::SetOnDone(CallHandler call_handler,
         }
 
         if (enqueue_result.ok()) {
+          GRPC_HTTP2_CLIENT_DLOG
+              << "Http2ClientTransport::SetOnDone "
+                 "MaybeAddStreamToWritableStreamList for stream= "
+              << stream->GetStreamId() << " enqueue_result={became_writable="
+              << enqueue_result.value().became_writable << ", priority="
+              << static_cast<uint8_t>(enqueue_result.value().priority) << "}";
           GRPC_UNUSED absl::Status status =
               self->MaybeAddStreamToWritableStreamList(stream,
                                                        enqueue_result.value());
@@ -1270,38 +1917,63 @@ bool Http2ClientTransport::SetOnDone(CallHandler call_handler,
 }
 
 std::optional<RefCountedPtr<Stream>> Http2ClientTransport::MakeStream(
-    CallHandler call_handler, const uint32_t stream_id) {
+    CallHandler call_handler) {
   // https://datatracker.ietf.org/doc/html/rfc9113#name-stream-identifiers
-  // TODO(tjagtap) : [PH2][P2] Validate implementation.
-
-  // TODO(akshitpatel) : [PH2][P1] : Probably do not need this lock. This
-  // function is always called under the stream_id_mutex_. The issue is the
-  // OnDone needs to be synchronous and hence InterActivityMutex might not be
-  // an option to protect the stream_list_.
-  MutexLock lock(&transport_mutex_);
-  RefCountedPtr<Stream> stream = MakeRefCounted<Stream>(
-      call_handler, stream_id, settings_.peer().allow_true_binary_metadata(),
-      settings_.acked().allow_true_binary_metadata(), flow_control_);
+  RefCountedPtr<Stream> stream;
+  {
+    // TODO(akshitpatel) : [PH2][P3] : Remove this mutex once settings is in
+    // place.
+    MutexLock lock(&transport_mutex_);
+    stream = MakeRefCounted<Stream>(call_handler, flow_control_);
+  }
   const bool on_done_added = SetOnDone(call_handler, stream);
   if (!on_done_added) return std::nullopt;
-  stream_list_.emplace(stream_id, stream);
   return stream;
 }
 
+uint32_t Http2ClientTransport::GetMaxAllowedStreamId() const {
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport GetMaxAllowedStreamId "
+                         << max_allowed_stream_id_;
+  return max_allowed_stream_id_;
+}
+
+void Http2ClientTransport::SetMaxAllowedStreamId(
+    const uint32_t max_allowed_stream_id) {
+  const uint32_t old_max_allowed_stream_id = GetMaxAllowedStreamId();
+  GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport SetMaxAllowedStreamId "
+                         << " max_allowed_stream_id: " << max_allowed_stream_id
+                         << " old_allowed_max_stream_id: "
+                         << old_max_allowed_stream_id;
+  // RFC9113 : Endpoints MUST NOT increase the value they send in the last
+  // stream identifier, since the peers might already have retried unprocessed
+  // requests on another connection.
+  if (GPR_LIKELY(max_allowed_stream_id <= old_max_allowed_stream_id)) {
+    max_allowed_stream_id_ = max_allowed_stream_id;
+  } else {
+    LOG_IF(ERROR, max_allowed_stream_id > old_max_allowed_stream_id)
+        << "Endpoints MUST NOT increase the value they send in the last "
+           "stream "
+           "identifier";
+    GRPC_DCHECK_LE(max_allowed_stream_id, old_max_allowed_stream_id)
+        << "Endpoints MUST NOT increase the value they send in the last "
+           "stream "
+           "identifier";
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Call Spine related operations
 
-auto Http2ClientTransport::CallOutboundLoop(
-    CallHandler call_handler, RefCountedPtr<Stream> stream,
-    InterActivityMutex<uint32_t>::Lock lock /* Locked stream_id_mutex */,
-    ClientMetadataHandle metadata) {
+auto Http2ClientTransport::CallOutboundLoop(CallHandler call_handler,
+                                            RefCountedPtr<Stream> stream,
+                                            ClientMetadataHandle metadata) {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport CallOutboundLoop";
   GRPC_DCHECK(stream != nullptr);
 
   auto send_message = [self = RefAsSubclass<Http2ClientTransport>(),
                        stream](MessageHandle&& message) mutable {
     return TrySeq(stream->EnqueueMessage(std::move(message)),
-                  [self, stream](const EnqueueResult result) mutable {
+                  [self, stream](const StreamWritabilityUpdate result) mutable {
                     GRPC_HTTP2_CLIENT_DLOG
                         << "Http2ClientTransport CallOutboundLoop "
                            "Enqueued Message";
@@ -1317,7 +1989,7 @@ auto Http2ClientTransport::CallOutboundLoop(
         [stream, metadata = std::move(metadata)]() mutable {
           return stream->EnqueueInitialMetadata(std::move(metadata));
         },
-        [self, stream](const EnqueueResult result) mutable {
+        [self, stream](const StreamWritabilityUpdate result) mutable {
           GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport CallOutboundLoop "
                                     "Enqueued Initial Metadata";
           return self->MaybeAddStreamToWritableStreamList(std::move(stream),
@@ -1328,7 +2000,7 @@ auto Http2ClientTransport::CallOutboundLoop(
   auto send_half_closed = [self = RefAsSubclass<Http2ClientTransport>(),
                            stream]() mutable {
     return TrySeq([stream]() { return stream->EnqueueHalfClosed(); },
-                  [self, stream](const EnqueueResult result) mutable {
+                  [self, stream](const StreamWritabilityUpdate result) mutable {
                     GRPC_HTTP2_CLIENT_DLOG
                         << "Http2ClientTransport CallOutboundLoop "
                            "Enqueued Half Closed";
@@ -1340,7 +2012,7 @@ auto Http2ClientTransport::CallOutboundLoop(
       "Ph2CallOutboundLoop",
       TrySeq(
           send_initial_metadata(),
-          [call_handler, send_message, lock = std::move(lock)]() {
+          [call_handler, send_message]() {
             // The lock will be released once the promise is constructed from
             // this factory. ForEach will be polled after the lock is
             // released.
@@ -1365,44 +2037,38 @@ void Http2ClientTransport::StartCall(CallHandler call_handler) {
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport StartCall Begin";
   call_handler.SpawnGuarded(
       "OutboundLoop",
-      TrySeq(
-          call_handler.PullClientInitialMetadata(),
-          [self = RefAsSubclass<Http2ClientTransport>()](
-              ClientMetadataHandle metadata) {
-            // Lock the stream_id_mutex_
-            return Staple(self->stream_id_mutex_.Acquire(),
-                          std::move(metadata));
-          },
-          [self = RefAsSubclass<Http2ClientTransport>(),
-           call_handler](auto args /* Locked stream_id_mutex */) mutable {
-            // For a gRPC Client, we only need to check the
-            // MAX_CONCURRENT_STREAMS setting compliance at the time of
-            // sending (that is write path). A gRPC Client will never
-            // receive a stream initiated by a server, so we dont have to
-            // check MAX_CONCURRENT_STREAMS compliance on the Read-Path.
-            //
-            // TODO(tjagtap) : [PH2][P1] Check for MAX_CONCURRENT_STREAMS
-            // sent by peer before making a stream. Decide behaviour if we are
-            // crossing this threshold.
-            //
-            // TODO(tjagtap) : [PH2][P1] : For a server we will have to do
-            // this for incoming streams only. If a server receives more streams
-            // from a client than is allowed by the clients settings, whether or
-            // not we should fail is debatable.
-            const uint32_t stream_id = self->NextStreamId(std::get<0>(args));
-            std::optional<RefCountedPtr<Stream>> stream =
-                self->MakeStream(call_handler, stream_id);
-            return If(
-                stream.has_value(),
-                [self, call_handler, stream, args = std::move(args)]() mutable {
-                  return Map(
-                      self->CallOutboundLoop(call_handler, stream.value(),
-                                             std::move(std::get<0>(args)),
-                                             std::move(std::get<1>(args))),
-                      [](absl::Status status) { return status; });
-                },
-                []() { return absl::InternalError("Failed to make stream"); });
-          }));
+      TrySeq(call_handler.PullClientInitialMetadata(),
+             [self = RefAsSubclass<Http2ClientTransport>(),
+              call_handler](ClientMetadataHandle metadata) mutable {
+               // For a gRPC Client, we only need to check the
+               // MAX_CONCURRENT_STREAMS setting compliance at the time of
+               // sending (that is write path). A gRPC Client will never
+               // receive a stream initiated by a server, so we dont have to
+               // check MAX_CONCURRENT_STREAMS compliance on the Read-Path.
+               //
+               // TODO(tjagtap) : [PH2][P1] Check for MAX_CONCURRENT_STREAMS
+               // sent by peer before making a stream. Decide behaviour if we
+               // are crossing this threshold.
+               //
+               // TODO(tjagtap) : [PH2][P1] : For a server we will have to do
+               // this for incoming streams only. If a server receives more
+               // streams from a client than is allowed by the clients settings,
+               // whether or not we should fail is debatable.
+               std::optional<RefCountedPtr<Stream>> stream =
+                   self->MakeStream(call_handler);
+               return If(
+                   stream.has_value(),
+                   [self, call_handler, stream,
+                    initial_metadata = std::move(metadata)]() mutable {
+                     return Map(
+                         self->CallOutboundLoop(call_handler, stream.value(),
+                                                std::move(initial_metadata)),
+                         [](absl::Status status) { return status; });
+                   },
+                   []() {
+                     return absl::InternalError("Failed to make stream");
+                   });
+             }));
   GRPC_HTTP2_CLIENT_DLOG << "Http2ClientTransport StartCall End";
 }