You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by se...@apache.org on 2016/10/13 07:52:16 UTC
aurora git commit: Blank out executor config in startJobUpdate log
messages.
Repository: aurora
Updated Branches:
refs/heads/master 1b3b7f53e -> 8256000d5
Blank out executor config in startJobUpdate log messages.
We are already applying a blanking of `ExecutorConfig` objects for any API
call with a `JobConfiguration` argument. We now extend this filtering to also
consider `JobUpdateRequest` objects.
Example log message with blanked config.
I1012 08:32:59.841 [qtp713342922-40, LoggingInterceptor:78] startJobUpdate(JobUpdateRequest(taskConfig:TaskConfig(job:JobKey(role:www-data, environment:prod, name:hello), owner:Identity(user:vagrant), isService:true, numCpus:1.0, ramMb:128, diskMb:128, priority:0, maxTaskFailures:1, production:false, tier:preemptible, resources:[], constraints:[], requestedPorts:[], taskLinks:{}, executorConfig:ExecutorConfig(name:BLANKED, data:BLANKED), metadata:[], container:<Container mesos:MesosContainer()>), instanceCount:1, settings:JobUpdateSettings(updateGroupSize:1, maxPerInstanceFailures:0, maxFailedInstances:0, minWaitInInstanceRunningMs:45000, rollbackOnFailure:true, updateOnlyTheseInstances:null, waitForBatchCompletion:false), metadata:[Metadata(key:org.apache.aurora.client.update_id, value:773ae166-bd77-4b07-8368-62473aecd67e)]), null)
Reviewed at https://reviews.apache.org/r/52776/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/8256000d
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/8256000d
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/8256000d
Branch: refs/heads/master
Commit: 8256000d5de87952708dc7616d6db4aac0cd0371
Parents: 1b3b7f5
Author: Stephan Erb <se...@apache.org>
Authored: Thu Oct 13 09:51:59 2016 +0200
Committer: Stephan Erb <se...@apache.org>
Committed: Thu Oct 13 09:51:59 2016 +0200
----------------------------------------------------------------------
.../aurora/scheduler/thrift/aop/LoggingInterceptor.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/8256000d/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
index e0d6c56..d6fbc6a 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/aop/LoggingInterceptor.java
@@ -25,6 +25,7 @@ import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.aurora.gen.ExecutorConfig;
import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.gen.JobUpdateRequest;
import org.apache.aurora.gen.ResponseCode;
import org.apache.aurora.scheduler.storage.Storage;
import org.apache.aurora.scheduler.thrift.Responses;
@@ -49,6 +50,15 @@ class LoggingInterceptor implements MethodInterceptor {
new ExecutorConfig("BLANKED", "BLANKED"));
}
return configuration.toString();
+ },
+ JobUpdateRequest.class,
+ input -> {
+ JobUpdateRequest configuration = ((JobUpdateRequest) input).deepCopy();
+ if (configuration.isSetTaskConfig()) {
+ configuration.getTaskConfig().setExecutorConfig(
+ new ExecutorConfig("BLANKED", "BLANKED"));
+ }
+ return configuration.toString();
}
);