Revert "Auto merge of #1618 - jtgeibel:conduit-hyper-round2, r=sgrif"

[sgrif]

This reverts commit 69368a6, reversing
changes made to 6fa8ad3.

When deploying this change, we saw response times nearly triple, and our
CPU usage went through the roof. Additionally, this did not appear to
fix the memory issues we were hoping to address by removing civet.

/cc @jtgeibel

[sgrif]

[sgrif]

Note: I do think there's a possibility that we just had bad luck with noisy neighbors, and I do want to try deploying this again one more time when I can be around to keep an eye on it, but I'd like to get it off master so we don't block things until then

[jtgeibel]

I do think there's a possibility that we just had bad luck with noisy neighbors

That's definitely a possibility. I had done some load/concurrently testing of some API endpoints and didn't see any noticeable difference in requests per second before and after the change. However, I was only looking at RPS, not response time for individual requests and I'm now wondering if I was just effectively load testing the database. I'll also do some load testing of non-API endpoints to see if serving the static ember HTML is impacted.

I agree, lets revert for now to keep master deployable.

@bors r+

[bors]

📌 Commit d19d2d4 has been approved by jtgeibel

[bors]

⌛ Testing commit d19d2d4 with merge a0b36cd...

[sgrif]

👍 I'm also fine just trying again as is later this week, just need to do it when I have some time to be around

[bors]

☀️ Test successful - checks-travis
Approved by: jtgeibel
Pushing a0b36cd to master...