Repository: ambari Updated Branches: refs/heads/trunk cb407d0ee -> 2d259af94
AMBARI-14300: Remove storm-cluster-logs and storm-worker-logs config upgrade properties (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d259af9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d259af9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d259af9 Branch: refs/heads/trunk Commit: 2d259af943071acb56b3b3cb63031648b76a39c2 Parents: cb407d0 Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Wed Dec 9 19:24:27 2015 -0800 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Wed Dec 9 19:24:27 2015 -0800 ---------------------------------------------------------------------- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 8 - .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 8 - .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 4 - .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 159 +------------------ 4 files changed, 1 insertion(+), 178 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2d259af9/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml index 678b5ab..b901cd5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml @@ -332,14 +332,6 @@ </execute-stage> <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_cluster_logs_content"/> - </execute-stage> - - <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_worker_logs_content"/> - </execute-stage> - - <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_update_env_vars"/> </execute-stage> </group> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d259af9/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml index fb39f00..d27b217 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml @@ -486,14 +486,6 @@ </execute-stage> <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_cluster_logs_content"/> - </execute-stage> - - <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_worker_logs_content"/> - </execute-stage> - - <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_update_env_vars"/> </execute-stage> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d259af9/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index 26f4611..289e790 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -860,10 +860,6 @@ <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_convert_nimbus_host_to_seeds"/> <task xsi:type="configure" id="hdp_2_3_0_0_update_storm_env"/> - - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_cluster_logs_content"/> - - <task xsi:type="configure" id="hdp_2_3_0_0_add_storm_worker_logs_content"/> <task xsi:type="configure" id="hdp_2_3_0_0_nimbus_update_env_vars"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/2d259af9/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index 6f4f7c3..51c6029 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -787,164 +787,7 @@ <type>storm-env</type> <set key="storm_logs_supported" value="true" /> </definition> - <definition id="hdp_2_3_0_0_add_storm_cluster_logs_content"> - <type>storm-cluster-log4j</type> - <set key="content" value="<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<configuration monitorInterval="60"> -<properties> - <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property> - <property name="patternMetris">%d %-8r %m%n</property> -</properties> -<appenders> - <RollingFile name="A1" - fileName="${sys:storm.log.dir}/${sys:logfile.name}" - filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i"> - <PatternLayout> - <pattern>${pattern}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="9"/> - </RollingFile> - <RollingFile name="ACCESS" - fileName="${sys:storm.log.dir}/access.log" - filePattern="${sys:storm.log.dir}/access.log.%i"> - <PatternLayout> - <pattern>${pattern}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="9"/> - </RollingFile> - <RollingFile name="METRICS" - fileName="${sys:storm.log.dir}/metrics.log" - filePattern="${sys:storm.log.dir}/metrics.log.%i"> - <PatternLayout> - <pattern>${patternMetris}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="2 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="9"/> - </RollingFile> - <Syslog name="syslog" format="RFC5424" host="localhost" port="514" - protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" includeMDC="true" - facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}" - messageId="[${sys:user.name}:S0]" id="storm"/> -</appenders> -<loggers> - - <Logger name="backtype.storm.security.auth.authorizer" level="info"> - <AppenderRef ref="ACCESS"/> - </Logger> - <Logger name="backtype.storm.metric.LoggingMetricsConsumer" level="info"> - <AppenderRef ref="METRICS"/> - </Logger> - <root level="info"> <!-- We log everything --> - <appender-ref ref="A1"/> - <appender-ref ref="syslog"/> - </root> -</loggers> -</configuration>"/> - </definition> - <definition id="hdp_2_3_0_0_add_storm_worker_logs_content"> - <type>storm-worker-log4j</type> - <set key="content" value="<!-- -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<configuration monitorInterval="60"> -<properties> - <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property> - <property name="patternNoTime">%msg%n</property> -</properties> -<appenders> - <RollingFile name="A1" - fileName="${sys:storm.log.dir}/${sys:logfile.name}" - filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i.gz"> - <PatternLayout> - <pattern>${pattern}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="9"/> - </RollingFile> - <RollingFile name="STDOUT" - fileName="${sys:storm.log.dir}/${sys:logfile.name}.out" - filePattern="${sys:storm.log.dir}/${sys:logfile.name}.out.%i.gz"> - <PatternLayout> - <pattern>${patternNoTime}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="4"/> - </RollingFile> - <RollingFile name="STDERR" - fileName="${sys:storm.log.dir}/${sys:logfile.name}.err" - filePattern="${sys:storm.log.dir}/${sys:logfile.name}.err.%i.gz"> - <PatternLayout> - <pattern>${patternNoTime}</pattern> - </PatternLayout> - <Policies> - <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB --> - </Policies> - <DefaultRolloverStrategy max="4"/> - </RollingFile> - <Syslog name="syslog" format="RFC5424" host="localhost" port="514" - protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" mdcId="mdc" includeMDC="true" - facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}" - messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm"/> -</appenders> -<loggers> - <root level="info"> <!-- We log everything --> - <appender-ref ref="A1"/> - <appender-ref ref="syslog"/> - </root> - <Logger name="STDERR" level="INFO"> - <appender-ref ref="STDERR"/> - <appender-ref ref="syslog"/> - </Logger> - <Logger name="STDOUT" level="INFO"> - <appender-ref ref="STDOUT"/> - <appender-ref ref="syslog"/> - </Logger> -</loggers> -</configuration>"/> - </definition> - + <definition xsi:type="configure" id="hdp_2_3_0_0_nimbus_monitor_freq_adjustment"> <condition type="storm-site" key="nimbus.monitor.freq.secs" value="10"> <type>storm-site</type>