[ 
https://issues.apache.org/jira/browse/FLINK-6494?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16055979#comment-16055979
 ] 

ASF GitHub Bot commented on FLINK-6494:
---------------------------------------

Github user zentol commented on a diff in the pull request:

    https://github.com/apache/flink/pull/4075#discussion_r123015212
  
    --- Diff: 
flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosApplicationMasterRunner.java
 ---
    @@ -492,42 +492,38 @@ public static MesosConfiguration 
createMesosConfig(Configuration flinkConfig, St
                        .setHostname(hostname);
                Protos.Credential.Builder credential = null;
     
    -           if (!flinkConfig.containsKey(ConfigConstants.MESOS_MASTER_URL)) 
{
    -                   throw new 
IllegalConfigurationException(ConfigConstants.MESOS_MASTER_URL + " must be 
configured.");
    +           if (!flinkConfig.contains(MesosConfigOptions.MESOS_MASTER_URL)) 
{
    +                   throw new 
IllegalConfigurationException(MesosConfigOptions.MESOS_MASTER_URL.key() + " 
must be configured.");
                }
    -           String masterUrl = 
flinkConfig.getString(ConfigConstants.MESOS_MASTER_URL, null);
    +           String masterUrl = 
flinkConfig.getString(MesosConfigOptions.MESOS_MASTER_URL, null);
     
                Duration failoverTimeout = FiniteDuration.apply(
                        flinkConfig.getInteger(
    -                           ConfigConstants.MESOS_FAILOVER_TIMEOUT_SECONDS,
    -                           
ConfigConstants.DEFAULT_MESOS_FAILOVER_TIMEOUT_SECS),
    +                           
MesosConfigOptions.MESOS_FAILOVER_TIMEOUT_SECONDS),
                        TimeUnit.SECONDS);
                frameworkInfo.setFailoverTimeout(failoverTimeout.toSeconds());
     
                frameworkInfo.setName(flinkConfig.getString(
    -                   ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_NAME,
    -                   
ConfigConstants.DEFAULT_MESOS_RESOURCEMANAGER_FRAMEWORK_NAME));
    +                   
MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_NAME));
     
                frameworkInfo.setRole(flinkConfig.getString(
    -                   ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_ROLE,
    -                   
ConfigConstants.DEFAULT_MESOS_RESOURCEMANAGER_FRAMEWORK_ROLE));
    +                   
MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_ROLE));
     
                frameworkInfo.setUser(flinkConfig.getString(
    -                   ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_USER,
    -                   
ConfigConstants.DEFAULT_MESOS_RESOURCEMANAGER_FRAMEWORK_USER));
    +                   
MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_USER));
     
    -           if 
(flinkConfig.containsKey(ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_PRINCIPAL))
 {
    +           if 
(flinkConfig.contains(MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_PRINCIPAL))
 {
                        frameworkInfo.setPrincipal(flinkConfig.getString(
    -                           
ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_PRINCIPAL, null));
    +                           
MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_PRINCIPAL, null));
     
                        credential = Protos.Credential.newBuilder();
                        credential.setPrincipal(frameworkInfo.getPrincipal());
     
                        // some environments use a side-channel to communicate 
the secret to Mesos,
                        // and thus don't set the 'secret' configuration setting
    -                   if 
(flinkConfig.containsKey(ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_SECRET))
 {
    +                   if 
(flinkConfig.contains(MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_SECRET))
 {
                                credential.setSecret(flinkConfig.getString(
    -                                   
ConfigConstants.MESOS_RESOURCEMANAGER_FRAMEWORK_SECRET, null));
    +                                   
MesosConfigOptions.MESOS_RESOURCEMANAGER_FRAMEWORK_SECRET, null));
    --- End diff --
    
    null argument can be removed.


> Migrate ResourceManager configuration options
> ---------------------------------------------
>
>                 Key: FLINK-6494
>                 URL: https://issues.apache.org/jira/browse/FLINK-6494
>             Project: Flink
>          Issue Type: Sub-task
>          Components: Distributed Coordination, ResourceManager
>            Reporter: Chesnay Schepler
>            Assignee: Fang Yong
>




--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Reply via email to