Skip to content

TRQ-4062. Add IP address field to momctl -d output#448

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
acvizi merged 1 commit into from
Sep 18, 2017
Merged

TRQ-4062. Add IP address field to momctl -d output #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/resmom/mom_main.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

{
output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
output << " PID: " << getpid() << "\n";
} /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
char *ptr; /* local tmp variable */
int network_retries = 0;

struct sockaddr_in network_addr;

/* must be started with real and effective uid of 0 */
if (IamRoot() == 0)
{
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
hostc = 1;
}

// Get external IP address of local node
if (get_local_address(network_addr) == 0)
{
inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
}

if (!multi_mom)
{
log_init(NULL, mom_host);
Expand Down
5 changes: 5 additions & 0 deletions src/test/mom_main/scaffolding.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
{
return PBSE_NONE;
}
27 changes: 27 additions & 0 deletions src/test/mom_main/test_uut.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

{
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
{
std::stringstream output;
std::string output_str;

mom_ipaddr[0] = '\0';
mom_short_name[0] = '\0';
mom_host[0] = '\0';

add_diag_header(output);

output_str = output.str();

fail_unless(output_str.find("IP address") != std::string::npos);
}
END_TEST


Suite *mom_main_suite(void)
{
Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
tcase_add_test(tc_core, test_parse_command_line3);
suite_add_tcase(s, tc_core);

tc_core = tcase_create("test_add_diag_header");
tcase_add_test(tc_core, test_add_diag_header);
suite_add_tcase(s, tc_core);

return s;
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
TRQ-4062. Add IP address field to momctl -d output by DanielSaunders · Pull Request #448 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4062. Add IP address field to momctl -d output#448

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

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4062. Add IP address field to momctl -d output
#448
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 11 additions & 1 deletion
src/resmom/mom_main.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,6 +192,7 @@ char *path_undeliv;
char *path_aux;
char *path_home = (char *)PBS_SERVER_HOME;
char *mom_home;
char mom_ipaddr[INET_ADDRSTRLEN];

bool use_path_home = false;

Expand DownExpand Up@@ -1645,7 +1646,8 @@ void add_diag_header(

 {
 output << "\nHost: " << mom_short_name << "/" << mom_host << " Version: ";
 output << PACKAGE_VERSION << " PID: " << getpid() << "\n";
 output << PACKAGE_VERSION << " IP address: " << mom_ipaddr;
 output << " PID: " << getpid() << "\n";
 } /* END add_diag_header() */


Expand DownExpand Up@@ -4897,6 +4899,8 @@ int setup_program_environment(void)
 char *ptr; /* local tmp variable */
 int network_retries = 0;

 struct sockaddr_in network_addr;

 /* must be started with real and effective uid of 0 */
 if (IamRoot() == 0)
 {
Expand DownExpand Up@@ -5075,6 +5079,12 @@ int setup_program_environment(void)
 hostc = 1;
 }

 // Get external IP address of local node
 if (get_local_address(network_addr) == 0)
 {
 inet_ntop(AF_INET, &(network_addr.sin_addr), mom_ipaddr, INET_ADDRSTRLEN);
 }

 if (!multi_mom)
 {
 log_init(NULL, mom_host);
Expand Down

5 changes: 5 additions & 0 deletions
src/test/mom_main/scaffolding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1146,3 +1146,8 @@ int read_all_devices()
bool get_cray_taskstats;

void read_rur_stats_file(const char *basepath) {}

int get_local_address(struct sockaddr_in &new_sockaddr)
 {
 return PBSE_NONE;
 }

27 changes: 27 additions & 0 deletions
src/test/mom_main/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ int process_layout_request(tcp_chan *chan);
bool should_resend_obit(job *pjob, int diff);
void check_job_in_mom_wait(job *pjob);
void evaluate_job_in_prerun(job *pjob);
void add_diag_header(std::stringstream &output);

extern attribute_def job_attr_def[];
extern int exiting_tasks;
Expand All@@ -47,6 +48,10 @@ extern int flush_ret;
extern int job_bailed;
extern bool am_i_ms;

extern char mom_host[PBS_MAXHOSTNAME + 1];
extern char mom_short_name[PBS_MAXHOSTNAME + 1];
extern char mom_ipaddr[INET_ADDRSTRLEN];

bool are_we_forking()

 {
Expand DownExpand Up@@ -450,6 +455,24 @@ START_TEST(test_parse_command_line3)
END_TEST


START_TEST(test_add_diag_header)
 {
 std::stringstream output;
 std::string output_str;

 mom_ipaddr[0] = '\0';
 mom_short_name[0] = '\0';
 mom_host[0] = '\0';

 add_diag_header(output);

 output_str = output.str();

 fail_unless(output_str.find("IP address") != std::string::npos);
 }
END_TEST


Suite *mom_main_suite(void)
 {
 Suite *s = suite_create("mom_main_suite methods");
Expand DownExpand Up@@ -486,6 +509,10 @@ Suite *mom_main_suite(void)
 tcase_add_test(tc_core, test_parse_command_line3);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_add_diag_header");
 tcase_add_test(tc_core, test_add_diag_header);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down