This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 6cdb19a [DLAB-1280] Fixed bug with starting spark cluster by scheduler
6cdb19a is described below
commit 6cdb19a47f926a9306c6286e76674f37ecdb6015
Author: Oleh Fuks <[email protected]>
AuthorDate: Mon Nov 25 16:01:05 2019 +0200
[DLAB-1280] Fixed bug with starting spark cluster by scheduler
---
.../src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java
index db66de5..2fbb299 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/SchedulerJobDAO.java
@@ -176,7 +176,7 @@ public class SchedulerJobDAO extends BaseDAO {
and(schedulerNotNullCondition()));
return find(USER_INSTANCES,
and(eq(STATUS, exploratoryStatus.toString()),
computationalSchedulerCondition),
- fields(excludeId(), include(USER,
EXPLORATORY_NAME, COMPUTATIONAL_RESOURCES)));
+ fields(excludeId(), include(USER, PROJECT,
EXPLORATORY_NAME, COMPUTATIONAL_RESOURCES)));
}
public void removeScheduler(String user, String exploratory) {
@@ -208,9 +208,9 @@ public class SchedulerJobDAO extends BaseDAO {
private SchedulerJobData toSchedulerData(Document userInstanceDocument,
Document compResource) {
final String user = userInstanceDocument.getString(USER);
+ final String project = userInstanceDocument.getString(PROJECT);
final String exploratoryName =
userInstanceDocument.getString(EXPLORATORY_NAME);
final String computationalName =
compResource.getString(COMPUTATIONAL_NAME);
- final String project = compResource.getString(PROJECT);
final SchedulerJobDTO schedulerData =
convertFromDocument((Document) compResource.get(SCHEDULER_DATA),
SchedulerJobDTO.class);
return new SchedulerJobData(user, exploratoryName,
computationalName, project, schedulerData);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
