Skip to content

Conversation

@EvanKrall
Copy link
Member

No description provided.

self.get_deploy_group() is None
and self.get_executor() in MESOS_EXECUTOR_NAMES
):
if self.get_deploy_group() is None and self.get_executor() != "ssh":
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tweaked this manually. This will make this check stricter -- anything with executor: spark will now have this check.

@EvanKrall EvanKrall marked this pull request as ready for review June 25, 2025 19:04
@EvanKrall EvanKrall requested a review from a team as a code owner June 25, 2025 19:04
return (False, "%s (timeout %d seconds)" % (os.strerror(result), timeout))


def execute_in_container(docker_client, container_id, command, timeout):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to port any of the other logic that used to be in the paasta_execute_docker_command version?

(would also be nice to add some types to this since this isn't just a 1:1 move, but i won't block on that :p)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

silly robot, dunno why it rewrote this.

That said, the existing code seems to have a bug that I think I actually hit while using local-run the other day -- if something execs into the container before paasta does, it looks like it doesn't create an exec.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I've put back the original function and fixed the bug. Now if the loop that searches for an existing exec doesn't find the one we're looking for, we'll create a new one.

Copy link
Member

@nemacysts nemacysts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(looks like there's still some references to deleted files)

host_ip=info.get("host_ip"),
git_sha=info.get("git_sha"),
config_sha=info.get("config_sha"),
mesos_container_id=None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: might be worth checking that the consumers of this will handle this field not existing at all anymore (pretty sure only splunk reads this and that it will gracefully handle things tho)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the savedsearch might do exactly the opposite of what we want if the mesos_container_id is missing. It's currently checking specifically for "null".

…e_docker_command.py to general_itests/steps/local_run_steps.py to fix itests
…e_docker_command.py to general_itests/steps/local_run_steps.py to fix itests
@nemacysts
Copy link
Member

@Krall given this pr, do we still need/want #3876?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants