WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated with suggestions

This commit is contained in:
Enrico Da Ros 2020-11-05 08:49:40 +00:00
parent cc21cc6acc
commit 009a4aabe0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/n_osync.sh
View File

@ -513,8 +513,16 @@ function _HandleLocksRemote {
CheckConnectivity3rdPartyHosts CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost CheckConnectivityRemoteHost
# Check if -A exists on target
ps -A > /dev/null 2>&1
notExistaCapitalA=$?
# Create an array of all currently running pids # Create an array of all currently running pids
read -a initiatorRunningPids <<< $(ps -a | tail -n +2 | awk '{print $1}') if [ "$notExistaCapitalA" == "1"]; then
read -a initiatorRunningPids <<< $(ps -e | tail -n +2 | awk '{print $1}')
else
read -a initiatorRunningPids <<< $(ps -A | tail -n +2 | awk '{print $1}')
fi
# passing initiatorRunningPids as litteral string (has to be run through eval to be an array again) # passing initiatorRunningPids as litteral string (has to be run through eval to be an array again)
$SSH_CMD env _REMOTE_TOKEN="$_REMOTE_TOKEN" \ $SSH_CMD env _REMOTE_TOKEN="$_REMOTE_TOKEN" \

2
dev/ofunctions.sh
View File

@ -767,7 +767,7 @@ function _PerfProfiler { #__WITH_PARANOIA_DEBUG
perfString=$(ps -p $$ -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan) #__WITH_PARANOIA_DEBUG perfString=$(ps -p $$ -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan) #__WITH_PARANOIA_DEBUG
#__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG
for i in $(pgrep -P $$); do #__WITH_PARANOIA_DEBUG for i in $(pgrep -P $$); do #__WITH_PARANOIA_DEBUG
perfString="$perfString\n"$(ps -p $i -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan | tail -1) #__WITH_PARANOIA_DEBUG perfString="$perfString\n"$(ps -p $i -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan | :| tail -1) #__WITH_PARANOIA_DEBUG
done #__WITH_PARANOIA_DEBUG done #__WITH_PARANOIA_DEBUG
#__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG
if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG