HQSession calling into transport to update priority

Summary: Make the priority update cross layer

Reviewed By: mjoras

Differential Revision: D24369945

fbshipit-source-id: 8dd6bf012484ebc888f2d1e7f64bc4e9284f7e6f

Author: Yang Chi

proxygen/lib/http/session/HQSession.cpp

@@ -2585,6 +2585,16 @@ void HQSession::HQStreamTransportBase::onHeadersComplete(
     session_.scheduleLoopCallback();
   }
 
+  auto timeDiff = std::chrono::duration_cast<std::chrono::milliseconds>(
+      std::chrono::steady_clock::now() - createdTime);
+  auto sock = session_.sock_;
+  auto streamId = getStreamId();
+  if (sock && sock->getState() && sock->getState()->qLogger) {
+    sock->getState()->qLogger->addStreamStateUpdate(
+        streamId, quic::kOnHeaders, timeDiff);
+  }
+  sock->setStreamPriority(streamId, msg->getPriority(), msg->getIncremental());
+
   // Tell the HTTPTransaction to start processing the message now
   // that the full ingress headers have arrived.
   // Depending on the push promise latch, the message is delivered to
@@ -2597,15 +2607,6 @@ void HQSession::HQStreamTransportBase::onHeadersComplete(
   } else {
     txn_.onIngressHeadersComplete(std::move(msg));
   }
-
-  auto timeDiff = std::chrono::duration_cast<std::chrono::milliseconds>(
-      std::chrono::steady_clock::now() - createdTime);
-  auto sock = session_.sock_;
-  auto streamId = getStreamId();
-  if (sock && sock->getState() && sock->getState()->qLogger) {
-    sock->getState()->qLogger->addStreamStateUpdate(
-        streamId, quic::kOnHeaders, timeDiff);
-  }
 }
 
 void HQSession::HQStreamTransportBase::transactionTimeout(
@@ -2774,6 +2775,8 @@ void HQSession::HQStreamTransportBase::sendHeaders(HTTPTransaction* txn,
           streamId, quic::kEOM, timeDiff);
     }
   }
+  sock->setStreamPriority(
+      streamId, headers.getPriority(), headers.getIncremental());
 
   // If partial reliability is enabled, enable the callbacks.
   if (session_.isPartialReliabilityEnabled() && headers.isPartiallyReliable()) {

proxygen/lib/http/session/test/HQDownstreamSessionTest.cpp

@@ -52,6 +52,15 @@ using HQDownstreamSessionTestHQPrSkips = HQDownstreamSessionTest;
 // Use this test class for h3 server push tests
 using HQDownstreamSessionTestHQPush = HQDownstreamSessionTest;
 
+namespace {
+HTTPMessage getProgressiveGetRequest() {
+  auto req = proxygen::getGetRequest();
+  req.getHeaders().add(HTTP_HEADER_PRIORITY, "u=1, i");
+  updateMessagePriorityFromPriorityString(req);
+  return req;
+}
+} // namespace
+
 HTTPCodec::StreamID HQDownstreamSessionTest::sendRequest(const std::string& url,
                                                          int8_t priority,
                                                          bool eom) {
@@ -326,6 +335,28 @@ TEST_P(HQDownstreamSessionTest, SimpleGet) {
   hqSession_->closeWhenIdle();
 }
 
+TEST_P(HQDownstreamSessionTest, PriorityUpdateIntoTransport) {
+  if (!IS_HQ) { // H1Q tests do not support priority
+    hqSession_->closeWhenIdle();
+    return;
+  }
+  auto request = getProgressiveGetRequest();
+  sendRequest(request);
+  auto handler = addSimpleStrictHandler();
+  EXPECT_CALL(*socketDriver_->getSocket(), setStreamPriority(_, 1, true));
+  handler->expectHeaders();
+  handler->expectEOM([&]() {
+    auto resp = makeResponse(200, 0);
+    std::get<0>(resp)->getHeaders().add(HTTP_HEADER_PRIORITY, "u=2");
+    updateMessagePriorityFromPriorityString(*std::get<0>(resp), "u=2");
+    EXPECT_CALL(*socketDriver_->getSocket(), setStreamPriority(_, 2, false));
+    handler->sendRequest(*std::get<0>(resp));
+  });
+  handler->expectDetachTransaction();
+  flushRequestsAndLoop();
+  hqSession_->closeWhenIdle();
+}
+
 TEST_P(HQDownstreamSessionTest, GetStopSending) {
   auto id = sendRequest(getGetRequest());
   auto handler = addSimpleStrictHandler();

proxygen/lib/http/session/test/HQUpstreamSessionTest.cpp

@@ -7,6 +7,7 @@
  */
 
 #include <proxygen/lib/http/session/test/HQUpstreamSessionTest.h>
+#include <proxygen/lib/http/codec/CodecUtil.h>
 #include <proxygen/lib/http/session/HQUpstreamSession.h>
 
 #include <folly/futures/Future.h>
@@ -328,6 +329,31 @@ TEST_P(HQUpstreamSessionTest, SimpleGet) {
   hqSession_->closeWhenIdle();
 }
 
+TEST_P(HQUpstreamSessionTest, PriorityUpdateIntoTransport) {
+  if (IS_HQ) {
+    auto handler = openTransaction();
+    auto req = getGetRequest();
+    req.getHeaders().add(HTTP_HEADER_PRIORITY, "u=3, i");
+    updateMessagePriorityFromPriorityString(req);
+    EXPECT_CALL(*socketDriver_->getSocket(), setStreamPriority(_, 3, true));
+    handler->txn_->sendHeadersWithEOM(req);
+
+    handler->expectHeaders();
+    handler->expectBody();
+    handler->expectEOM();
+    handler->expectDetachTransaction();
+    auto resp = makeResponse(200, 100);
+    std::get<0>(resp)->getHeaders().add(HTTP_HEADER_PRIORITY, "u=5");
+    sendResponse(handler->txn_->getID(),
+                 *std::get<0>(resp),
+                 std::move(std::get<1>(resp)),
+                 true);
+    EXPECT_CALL(*socketDriver_->getSocket(), setStreamPriority(_, 5, false));
+    flushAndLoop();
+  }
+  hqSession_->closeWhenIdle();
+}
+
 TEST_P(HQUpstreamSessionTest, NoNewTransactionIfSockIsNotGood) {
   socketDriver_->sockGood_ = false;
   EXPECT_EQ(hqSession_->newTransaction(nullptr), nullptr);