Skip to content
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

Don't drop ATTR_v when encoding attropl #416

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Don't drop ATTR_v when encoding attropl #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff71c7
Missing <sstream>, GCC 4.5.2 fails without
brewlius-cesar Feb 21, 2017
46c3cec
Prevent job "Variable_List" from being lost between submission attempts
brewlius-cesar Feb 21, 2017
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
1 change: 1 addition & 0 deletions src/cmds/qstat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <string.h>
#include <vector>
#include <string>
#include <sstream>

#if TCL_QSTAT
#include <sys/stat.h>
Expand Down
13 changes: 3 additions & 10 deletions src/lib/Libifl/enc_attropl_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ int build_var_list(
attrs->lock();
job_data_iterator *it = attrs->get_iterator();
int item_count = 0;
int preexisting_var_list = FALSE;

while ((atr = it->get_next_item()) != NULL)
{
Expand Down Expand Up @@ -159,20 +158,13 @@ int build_var_list(
var_list += ',';
}
var_list += atr->value;
preexisting_var_list = TRUE;
/* In this case, do not add an item (this is taken care or OUTSIDE this call) */
/* item_count++; */
item_count++;
}
}

delete it;
attrs->unlock();

if (preexisting_var_list == TRUE)
{
hash_del_item(attrs, (char *)ATTR_v);
}

return(item_count);
} /* END build_var_list() */

Expand Down Expand Up @@ -202,7 +194,8 @@ int encode_DIS_attropl_hash_single(
/* Data pattern:
* len of (name)(0 OR 1resource)(value)(op) */
if ((strncmp(atr->name.c_str(), "pbs_o", 5) == 0)
|| (strncmp(atr->name.c_str(), "PBS_O", 5) == 0))
|| (strncmp(atr->name.c_str(), "PBS_O", 5) == 0)
|| (strcmp(atr->name.c_str(), ATTR_v ) == 0 ))
continue;
if (is_res)
{
Expand Down