You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@griffin.apache.org by William GUO <gu...@outlook.com> on 2017/06/03 11:21:30 UTC
FW: incubator-griffin git commit: create job problem repair
.../griffin/core/schedule/SchedulerController.java | 5 +++--
.../apache/griffin/core/schedule/SparkSubmitJob.java | 14 +++++++++++---
ui/js/controllers/createrule-ac-ctrl.js | 3 ++-
Chen, why you checkin one js file, I though you only checkin java files?
William
On 6/3/17, 7:17 PM, "guoyp@apache.org" <gu...@apache.org> wrote:
Repository: incubator-griffin
Updated Branches:
refs/heads/master a5d547039 -> 9e408994b
create job problem repair
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Closes #56 from justACT/20170602jobRepair.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/9e408994
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/9e408994
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/9e408994
Branch: refs/heads/master
Commit: 9e408994bd9896824f0761fefa9a16c6b26b5cf1
Parents: a5d5470
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Authored: Sat Jun 3 19:17:05 2017 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Sat Jun 3 19:17:05 2017 +0800
----------------------------------------------------------------------
.../griffin/core/schedule/SchedulerController.java | 5 +++--
.../apache/griffin/core/schedule/SparkSubmitJob.java | 14 +++++++++++---
ui/js/controllers/createrule-ac-ctrl.js | 3 ++-
3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e408994/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index 5f01c2b..147b71d 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -89,8 +89,9 @@ public class SchedulerController {
map.put("measure", (String) jd.getJobDataMap().get("measure"));
map.put("sourcePat",jd.getJobDataMap().getString("sourcePat"));
map.put("targetPat",jd.getJobDataMap().getString("targetPat"));
-
- map.put("dataStartTimestamp",Long.parseLong(jd.getJobDataMap().getString("dataStartTimestamp")));
+ System.out.print("dataStartTimestamp:"+jd.getJobDataMap().getString("dataStartTimestamp"));
+ if(jd.getJobDataMap().getString("dataStartTimestamp")!=null && !jd.getJobDataMap().getString("dataStartTimestamp").equals(""))
+ map.put("dataStartTimestamp",jd.getJobDataMap().getString("dataStartTimestamp"));
map.put("jobStartTime",jd.getJobDataMap().getString("jobStartTime"));
map.put("periodTime",jd.getJobDataMap().getString("periodTime"));
list.add(map);
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e408994/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
index 28ce9f0..1c89deb 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SparkSubmitJob.java
@@ -177,12 +177,20 @@ public class SparkSubmitJob implements Job {
}
public long setCurrentTimestamp(long currentSystemTimestamp) {
- long currentTimstamp;
+ long currentTimstamp=0;
if (eachJoblastTimestamp != null && !eachJoblastTimestamp.equals("")) {
- currentTimstamp = Long.parseLong(eachJoblastTimestamp) + Integer.parseInt(periodTime) * 1000;
+ try {
+ currentTimstamp = Long.parseLong(eachJoblastTimestamp) + Integer.parseInt(periodTime) * 1000;
+ }catch (Exception e){
+ logger.info("lasttime or periodTime format problem! "+e);
+ }
} else {
if (dataStartTimestamp != null && !dataStartTimestamp.equals("")) {
- currentTimstamp = Long.parseLong(dataStartTimestamp);
+ try{
+ currentTimstamp = Long.parseLong(dataStartTimestamp);
+ }catch (Exception e){
+ logger.info("dataStartTimestamp format problem! "+e);
+ }
} else {
currentTimstamp = currentSystemTimestamp;
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9e408994/ui/js/controllers/createrule-ac-ctrl.js
----------------------------------------------------------------------
diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js
index 79b918f..1efa02f 100644
--- a/ui/js/controllers/createrule-ac-ctrl.js
+++ b/ui/js/controllers/createrule-ac-ctrl.js
@@ -409,7 +409,8 @@ define(['./module'], function(controllers) {
"evaluateRule":{
"rules":'',
},
- "owner":$scope.currentNode.parent[0].owner,
+// "owner":$scope.currentNode.parent[0].owner,
+ "owner":$scope.basic.owner,
mappings:[],
};