Skip to content

AMBARI-26232: There will be failure when executing shell.py and wrong order of imports for WidgetResourceProvider.java #3872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JiaLiangC merged 3 commits into from
Nov 8, 2024
Merged

AMBARI-26232: There will be failure when executing shell.py and wrong order of imports for WidgetResourceProvider.java #3872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9036d64
There will be failure when executing shell.py
guluo2016 Nov 8, 2024
4df579d
Wrong order of imports for WidgetResourceProvider.java
guluo2016 Nov 8, 2024
a5438f2
Fix issue of test failure
guluo2016 Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ambari-common/src/main/python/resource_management/core/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def checked_call(command, quiet=False, logoutput=None, stdout=subprocess.PIPE,st
@log_function_call
def call(command, quiet=False, logoutput=None, stdout=subprocess.PIPE,stderr=subprocess.STDOUT,
cwd=None, env=None, preexec_fn=preexec_fn, user=None, wait_for_finish=True, timeout=None, on_timeout=None,
path=None, sudo=False, on_new_line=None, tries=1, try_sleep=0, timeout_kill_strategy=TerminateStrategy.TERMINATE_PARENT, returns=[0]):
path=None, sudo=False, on_new_line=None, tries=1, try_sleep=0, timeout_kill_strategy=TerminateStrategy.TERMINATE_PARENT, shell=True, returns=[0]):
"""
Execute the shell command despite failures.
@return: return_code, output
Expand Down Expand Up @@ -213,11 +213,8 @@ def _call(command, logoutput=None, throw_on_failure=True, stdout=subprocess.PIPE
# replace placeholder from as_sudo / as_user if present
env_str = _get_environment_str(env)
for placeholder, replacement in PLACEHOLDERS_TO_STR.items():
command = command.replace(placeholder, replacement.format(env_str=env_str))
subprocess_command = [cmd.replace(placeholder, replacement.format(env_str=env_str)) for cmd in subprocess_command]

# --noprofile is used to preserve PATH set for ambari-agent
subprocess_command = ["/bin/bash","--login","--noprofile","-c", command]
if shell:
# --noprofile is used to preserve PATH set for ambari-agent
subprocess_command = ["/bin/bash","--login","--noprofile","-c"] + subprocess_command
Expand Down
4 changes: 2 additions & 2 deletions ...er/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
import com.google.common.collect.ImmutableSet;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonSerializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.inject.Inject;

/**
Expand Down
5 changes: 4 additions & 1 deletion ambari-server/src/main/resources/custom_actions/scripts/check_host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,10 @@ def execute_db_connection_check(self, config, tmp_dir):
db_connection_check_command = "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{0}{1} {2}".format(agent_cache_dir,
LIBS_PATH_IN_ARCHIVE_SQLA, db_connection_check_command)

code, out = shell.call(split(db_connection_check_command, comments=True), shell=False)
if isinstance(db_connection_check_command, str):
code, out = shell.call(split(db_connection_check_command, comments=True), shell=False)
else:
code, out = shell.call(db_connection_check_command, shell=False)

if code == 0:
db_connection_check_structured_output = {"exit_code" : 0, "message": "DB connection check completed successfully!" }
Expand Down