Revert hotfix on rel/relcorp for build command patching, implement a proper fix from main

[humitos]

• Build: Build command HttpNotFoundError: Client Error 404 #12317 (comment)

Diff between rel and main.

diff --git a/readthedocs/doc_builder/environments.py b/readthedocs/doc_builder/environments.py
index 21d25dbb7..e933a60ca 100644
--- a/readthedocs/doc_builder/environments.py
+++ b/readthedocs/doc_builder/environments.py
@@ -16,7 +16,6 @@ from docker.errors import DockerException
 from docker.errors import NotFound as DockerNotFoundError
 from requests.exceptions import ConnectionError
 from requests.exceptions import ReadTimeout
-from slumber.exceptions import HttpNotFoundError
 
 from readthedocs.builds.models import BuildCommandResultMixin
 from readthedocs.core.utils import slugify
@@ -266,27 +265,15 @@ class BuildCommand(BuildCommandResultMixin):
             "start_time": self.start_time,
             "end_time": self.end_time,
         }
-        resp = None
 
         # If the command has an id, it means it has been saved before,
         # so we update it instead of creating a new one.
         if self.id:
             resp = api_client.command(self.id).patch(data)
         else:
-            if self.id:
-                try:
-                    resp = api_client.command(self.id).patch(data)
-                except HttpNotFoundError:
-                    # TODO don't do this, address builds restarting instead.
-                    # We try to post the buildcommand again as a temporary fix
-                    # for projects that restart the build process. There seems to be
-                    # something that causes a 404 during `patch()` in some biulds,
-                    # so we assume retrying `post()` for the build command is okay.
-                    log.exception("Build command has an id but doesn't exist in the database.")
-                    resp = api_client.command.post(data)
-            else:
-                resp = api_client.command.post(data)
-            log.debug("Response via JSON encoded data.", response=resp)
+            resp = api_client.command.post(data)
+
+        log.debug("Response via JSON encoded data.", response=resp)
 
         self.id = resp.get("id")

[agjohnson]

The actual change I did was noted here: #12317 (comment)

• 60d1bf3

The above diff doesn't look right due to the extra if self.id conditional and lack of try around the first.

Noted on that comment, but I didn't apply to main because I was trying to be on vacation that Fri and there was already a new conflicting change merged after the release:

• Remove API_LARGE_DATA feature flag #12309

This hotfix should address both the changes.

[agjohnson]

Actually, #12338 should probably close this. We shouldn't revert the hotfix noted above, I think the end goal would instead be to implement the build healthcheck polling from #11870

• Apply hotfix to main #12338
• Build: build process polling healthcheck #11870

[humitos]

@agjohnson yeah, my goal here is to get merged the PR for #11870 today (I need a review there) so we can deploy it tomorrow and add these projects with long builds to the feature flag.

[ericholscher]

I think this should be done -- the code is in main and rel is matching.