incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1488039 [3/10] - in /incubator/ambari/branches/branch-1.2.4: ./ ambari-agent/ ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/ ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/ ambari-agent/src/main/puppet/modules/hdp-...
Date Thu, 30 May 2013 22:14:32 GMT
Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/ganglia_properties.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/ganglia_properties.json?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/ganglia_properties.json (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/ganglia_properties.json Thu May 30 22:14:29 2013
@@ -6223,1064 +6223,6 @@
       }
     },
 
-    "RESOURCEMANAGER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/yarn/Queue/running_0":{
-        "metric":"yarn.Queue.running_0",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/running_60":{
-        "metric":"yarn.Queue.running_60",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/running_300":{
-        "metric":"yarn.Queue.running_300",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/running_1440":{
-        "metric":"yarn.Queue.running_1440",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsSubmitted":{
-        "metric":"yarn.Queue.AppsSubmitted",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsRunning":{
-        "metric":"yarn.Queue.AppsRunning",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsPending":{
-        "metric":"yarn.Queue.AppsPending",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsCompleted":{
-        "metric":"yarn.Queue.AppsCompleted",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsKilled":{
-        "metric":"yarn.Queue.AppsKilled",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AppsFailed":{
-        "metric":"yarn.Queue.AppsFailed",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AllocatedMB":{
-        "metric":"yarn.Queue.AllocatedMB",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AllocatedContainers":{
-        "metric":"yarn.Queue.AllocatedContainers",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AggregateContainersAllocated":{
-        "metric":"yarn.Queue.AggregateContainersAllocated",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AggregateContainersReleased":{
-        "metric":"yarn.Queue.AggregateContainersReleased",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/AvailableMB":{
-        "metric":"yarn.Queue.AvailableMB",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/PendingMB":{
-        "metric":"yarn.Queue.PendingMB",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/PendingContainers":{
-        "metric":"yarn.Queue.PendingContainers",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/ReservedMB":{
-        "metric":"yarn.Queue.ReservedMB",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/ReservedContainers":{
-        "metric":"yarn.Queue.ReservedContainers",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/ActiveUsers":{
-        "metric":"yarn.Queue.ActiveUsers",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/yarn/Queue/ActiveApplications":{
-        "metric":"yarn.Queue.ActiveApplications",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
-    "NODEMANAGER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/mapred/ShuffleOutputBytes":{
-        "metric":"mapred.ShuffleOutputBytes",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleOutputsFailed":{
-        "metric":"mapred.ShuffleOutputsFailed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleOutputsOK":{
-        "metric":"mapred.ShuffleOutputsOK",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/mapred/ShuffleConnections":{
-        "metric":"mapred.ShuffleConnections",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/yarn/ContainersLaunched":{
-        "metric":"yarn.ContainersLaunched",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersCompleted":{
-        "metric":"yarn.ContainersCompleted",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersFailed":{
-        "metric":"yarn.ContainersFailed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersKilled":{
-        "metric":"yarn.ContainersKilled",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersIniting":{
-        "metric":"yarn.ContainersIniting",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/ContainersRunning":{
-        "metric":"yarn.ContainersRunning",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AllocatedGB":{
-        "metric":"yarn.AllocatedGB",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AllocatedContainers":{
-        "metric":"yarn.AllocatedContainers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/yarn/AvailableGB":{
-        "metric":"yarn.AvailableGB",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
-    "HISTORYSERVER":{
-      "metrics/boottime":{
-        "metric":"boottime",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_aidle":{
-        "metric":"cpu_aidle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_idle":{
-        "metric":"cpu_idle",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_nice":{
-        "metric":"cpu_nice",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_num":{
-        "metric":"cpu_num",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_speed":{
-        "metric":"cpu_speed",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_system":{
-        "metric":"cpu_system",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_user":{
-        "metric":"cpu_user",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/cpu/cpu_wio":{
-        "metric":"cpu_wio",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_free":{
-        "metric":"disk_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/disk_total":{
-        "metric":"disk_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/disk/part_max_used":{
-        "metric":"part_max_used",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/memory/mem_buffers":{
-        "metric":"mem_buffers",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_cached":{
-        "metric":"mem_cached",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_free":{
-        "metric":"mem_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_shared":{
-        "metric":"mem_shared",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/mem_total":{
-        "metric":"mem_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_free":{
-        "metric":"swap_free",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/memory/swap_total":{
-        "metric":"swap_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/network/bytes_in":{
-        "metric":"bytes_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/bytes_out":{
-        "metric":"bytes_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_in":{
-        "metric":"pkts_in",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/network/pkts_out":{
-        "metric":"pkts_out",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/process/proc_run":{
-        "metric":"proc_run",
-        "pointInTime":true,
-        "temporal":true
-      },
-      "metrics/process/proc_total":{
-        "metric":"proc_total",
-        "pointInTime":true,
-        "temporal":true
-      },
-
-      "metrics/jvm/MemNonHeapUsedM":{
-        "metric":"jvm.metrics.MemNonHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemNonHeapCommittedM":{
-        "metric":"jvm.metrics.MemNonHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapUsedM":{
-        "metric":"jvm.metrics.MemHeapUsedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/MemHeapCommittedM":{
-        "metric":"jvm.metrics.MemHeapCommittedM",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcCount":{
-        "metric":"jvm.metrics.GcCount",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/GcTimeMillis":{
-        "metric":"jvm.metrics.GcTimeMillis",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogFatal":{
-        "metric":"jvm.metrics.LogFatal",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogError":{
-        "metric":"jvm.metrics.LogError",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogWarn":{
-        "metric":"jvm.metrics.LogWarn",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/LogInfo":{
-        "metric":"jvm.metrics.LogInfo",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsNew":{
-        "metric":"jvm.metrics.ThreadsNew",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsRunnable":{
-        "metric":"jvm.metrics.ThreadsRunnable",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsBlocked":{
-        "metric":"jvm.metrics.ThreadsBlocked",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsWaiting":{
-        "metric":"jvm.metrics.ThreadsWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTimedWaiting":{
-        "metric":"jvm.metrics.ThreadsTimedWaiting",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/jvm/ThreadsTerminated":{
-        "metric":"jvm.metrics.ThreadsTerminated",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/rpc/ReceivedBytes":{
-        "metric":"rpc.metrics.ReceivedBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/SentBytes":{
-        "metric":"rpc.metrics.SentBytes",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeNumOps":{
-        "metric":"rpc.metrics.RpcQueueTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcQueueTimeAvgTime":{
-        "metric":"rpc.metrics.RpcQueueTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeNumOps":{
-        "metric":"rpc.metrics.RpcProcessingTimeNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcProcessingTimeAvgTime":{
-        "metric":"rpc.metrics.RpcProcessingTimeAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationFailures":{
-        "metric":"rpc.metrics.RpcAuthenticationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthenticationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthenticationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationFailures":{
-        "metric":"rpc.metrics.RpcAuthorizationFailures",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/RpcAuthorizationSuccesses":{
-        "metric":"rpc.metrics.RpcAuthorizationSuccesses",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/NumOpenConnections":{
-        "metric":"rpc.metrics.NumOpenConnections",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/rpc/CallQueueLength":{
-        "metric":"rpc.metrics.CallQueueLength",
-        "pointInTime":false,
-        "temporal":true
-      },
-
-      "metrics/ugi/LoginSuccessNumOps":{
-        "metric":"ugi.ugi.LoginSuccessNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginSuccessAvgTime":{
-        "metric":"ugi.ugi.LoginSuccessAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureNumOps":{
-        "metric":"ugi.ugi.LoginFailureNumOps",
-        "pointInTime":false,
-        "temporal":true
-      },
-      "metrics/ugi/LoginFailureAvgTime":{
-        "metric":"ugi.ugi.LoginFailureAvgTime",
-        "pointInTime":false,
-        "temporal":true
-      }
-
-    },
-
     "HBASE_MASTER":{
 
       "metrics/boottime":{

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/mysql-ddl.sql
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/mysql-ddl.sql?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/mysql-ddl.sql (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/mysql-ddl.sql Thu May 30 22:14:29 2013
@@ -102,7 +102,7 @@ insert into ambari.user_roles(role_name,
   select 'admin',1;
 
 insert into ambari.metainfo(`metainfo_key`, `metainfo_value`)
-  select 'version','${ambariVersion}';
+  select 'version','1.3.0';
 
 
 

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/oracle-DDL.sql
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/oracle-DDL.sql?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/oracle-DDL.sql (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/oracle-DDL.sql Thu May 30 22:14:29 2013
@@ -117,7 +117,7 @@ GRANT ALL ON metainfo TO &1;
 INSERT INTO ambari_sequences(sequence_name, value) values ('host_role_command_id_seq', 0);
 INSERT INTO ambari_sequences(sequence_name, value) values ('user_id_seq', 1);
 INSERT INTO ambari_sequences(sequence_name, value) values ('cluster_id_seq', 0);
-INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '${ambariVersion}');
+INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version', '1.3.0');
 
 insert into Roles(role_name)
 select 'admin' from dual

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.2.1/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5.1.3.0.0</version>
 
     <components>

Added: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg Thu May 30 22:14:29 2013
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+yarn.nodemanager.local-dirs=TODO-YARN-LOCAL-DIR
+yarn.nodemanager.linux-container-executor.group=hadoop
+yarn.nodemanager.log-dirs=TODO-YARN-LOG-DIR
+banned.users=hfds,bin,0

Added: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml Thu May 30 22:14:29 2013
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   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>
+</configuration>

Added: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml Thu May 30 22:14:29 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!--
+   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.
+-->
+
+<!-- mapred-queue-acls.xml -->
+<configuration>
+
+
+<!-- queue default -->
+
+  <property>
+    <name>mapred.queue.default.acl-submit-job</name>
+    <value>*</value>
+  </property>
+
+  <property>
+    <name>mapred.queue.default.acl-administer-jobs</name>
+    <value>*</value>
+  </property>
+
+  <!-- END ACLs -->
+
+</configuration>

Added: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml Thu May 30 22:14:29 2013
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!--
+   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.
+-->
+
+<!-- Put site-specific property overrides in this file. -->
+
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<!-- i/o properties -->
+
+  <property>
+    <name>io.sort.mb</name>
+    <value></value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>io.sort.record.percent</name>
+    <value>.2</value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>io.sort.spill.percent</name>
+    <value></value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>io.sort.factor</name>
+    <value>100</value>
+    <description>No description</description>
+  </property>
+
+<!-- map/reduce properties -->
+
+<property>
+  <name>mapred.tasktracker.tasks.sleeptime-before-sigkill</name>
+  <value>250</value>
+  <description>Normally, this is the amount of time before killing
+  processes, and the recommended-default is 5.000 seconds - a value of
+  5000 here.  In this case, we are using it solely to blast tasks before
+  killing them, and killing them very quickly (1/4 second) to guarantee
+  that we do not leave VMs around for later jobs.
+  </description>
+</property>
+
+  <property>
+    <name>mapred.job.tracker.handler.count</name>
+    <value>50</value>
+    <description>
+    The number of server threads for the JobTracker. This should be roughly
+    4% of the number of tasktracker nodes.
+    </description>
+  </property>
+
+  <property>
+    <name>mapred.system.dir</name>
+    <value>/mapred/system</value>
+    <description>No description</description>
+    <final>true</final>
+  </property>
+
+  <property>
+    <name>mapred.job.tracker</name>
+    <!-- cluster variant -->
+    <value></value>
+    <description>No description</description>
+    <final>true</final>
+  </property>
+
+  <property>
+    <name>mapred.job.tracker.http.address</name>
+    <!-- cluster variant -->
+    <value></value>
+    <description>No description</description>
+    <final>true</final>
+  </property>
+
+  <property>
+    <!-- cluster specific -->
+    <name>mapred.local.dir</name>
+    <value></value>
+    <description>No description</description>
+    <final>true</final>
+  </property>
+
+  <property>
+  <name>mapreduce.cluster.administrators</name>
+  <value> hadoop</value>
+  </property>
+
+  <property>
+    <name>mapred.reduce.parallel.copies</name>
+    <value>30</value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>mapred.tasktracker.map.tasks.maximum</name>
+    <value></value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>mapred.tasktracker.reduce.tasks.maximum</name>
+    <value></value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>tasktracker.http.threads</name>
+    <value>50</value>
+  </property>
+
+  <property>
+    <name>mapred.map.tasks.speculative.execution</name>
+    <value>false</value>
+    <description>If true, then multiple instances of some map tasks
+               may be executed in parallel.</description>
+  </property>
+
+  <property>
+    <name>mapred.reduce.tasks.speculative.execution</name>
+    <value>false</value>
+    <description>If true, then multiple instances of some reduce tasks
+               may be executed in parallel.</description>
+  </property>
+
+  <property>
+    <name>mapred.reduce.slowstart.completed.maps</name>
+    <value>0.05</value>
+  </property>
+
+  <property>
+    <name>mapred.inmem.merge.threshold</name>
+    <value>1000</value>
+    <description>The threshold, in terms of the number of files
+  for the in-memory merge process. When we accumulate threshold number of files
+  we initiate the in-memory merge and spill to disk. A value of 0 or less than
+  0 indicates we want to DON'T have any threshold and instead depend only on
+  the ramfs's memory consumption to trigger the merge.
+  </description>
+  </property>
+
+  <property>
+    <name>mapred.job.shuffle.merge.percent</name>
+    <value>0.66</value>
+    <description>The usage threshold at which an in-memory merge will be
+  initiated, expressed as a percentage of the total memory allocated to
+  storing in-memory map outputs, as defined by
+  mapred.job.shuffle.input.buffer.percent.
+  </description>
+  </property>
+
+  <property>
+    <name>mapred.job.shuffle.input.buffer.percent</name>
+    <value>0.7</value>
+    <description>The percentage of memory to be allocated from the maximum heap
+  size to storing map outputs during the shuffle.
+  </description>
+  </property>
+
+  <property>
+    <name>mapred.map.output.compression.codec</name>
+    <value></value>
+    <description>If the map outputs are compressed, how should they be
+      compressed
+    </description>
+  </property>
+
+<property>
+  <name>mapred.output.compression.type</name>
+  <value>BLOCK</value>
+  <description>If the job outputs are to compressed as SequenceFiles, how should
+               they be compressed? Should be one of NONE, RECORD or BLOCK.
+  </description>
+</property>
+
+
+  <property>
+    <name>mapred.jobtracker.completeuserjobs.maximum</name>
+    <value>5</value>
+  </property>
+
+  <property>
+    <name>mapred.jobtracker.taskScheduler</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.jobtracker.restart.recover</name>
+    <value>false</value>
+    <description>"true" to enable (job) recovery upon restart,
+               "false" to start afresh
+    </description>
+  </property>
+
+  <property>
+    <name>mapred.job.reduce.input.buffer.percent</name>
+    <value>0.0</value>
+    <description>The percentage of memory- relative to the maximum heap size- to
+  retain map outputs during the reduce. When the shuffle is concluded, any
+  remaining map outputs in memory must consume less than this threshold before
+  the reduce can begin.
+  </description>
+  </property>
+
+ <property>
+  <name>mapreduce.reduce.input.limit</name>
+  <value>10737418240</value>
+  <description>The limit on the input size of the reduce. (This value
+  is 10 Gb.)  If the estimated input size of the reduce is greater than
+  this value, job is failed. A value of -1 means that there is no limit
+  set. </description>
+</property>
+
+
+  <!-- copied from kryptonite configuration -->
+  <property>
+    <name>mapred.compress.map.output</name>
+    <value></value>
+  </property>
+
+
+  <property>
+    <name>mapred.task.timeout</name>
+    <value>600000</value>
+    <description>The number of milliseconds before a task will be
+  terminated if it neither reads an input, writes an output, nor
+  updates its status string.
+  </description>
+  </property>
+
+  <property>
+    <name>jetty.connector</name>
+    <value>org.mortbay.jetty.nio.SelectChannelConnector</value>
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>mapred.task.tracker.task-controller</name>
+    <value></value>
+   <description>
+     TaskController which is used to launch and manage task execution.
+  </description>
+  </property>
+
+  <property>
+    <name>mapred.child.root.logger</name>
+    <value>INFO,TLA</value>
+  </property>
+
+  <property>
+    <name>mapred.child.java.opts</name>
+    <value></value>
+
+    <description>No description</description>
+  </property>
+
+  <property>
+    <name>mapred.cluster.map.memory.mb</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.cluster.reduce.memory.mb</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.job.map.memory.mb</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.job.reduce.memory.mb</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.cluster.max.map.memory.mb</name>
+    <value></value>
+  </property>
+
+  <property>
+    <name>mapred.cluster.max.reduce.memory.mb</name>
+    <value></value>
+  </property>
+
+<property>
+  <name>mapred.hosts</name>
+  <value></value>
+</property>
+
+<property>
+  <name>mapred.hosts.exclude</name>
+  <value></value>
+</property>
+
+<property>
+  <name>mapred.max.tracker.blacklists</name>
+  <value>16</value>
+  <description>
+    if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted
+  </description>
+</property>
+
+<property>
+  <name>mapred.healthChecker.script.path</name>
+  <value></value>
+</property>
+
+<property>
+  <name>mapred.healthChecker.interval</name>
+  <value>135000</value>
+</property>
+
+<property>
+  <name>mapred.healthChecker.script.timeout</name>
+  <value>60000</value>
+</property>
+
+<property>
+  <name>mapred.job.tracker.persist.jobstatus.active</name>
+  <value>false</value>
+  <description>Indicates if persistency of job status information is
+  active or not.
+  </description>
+</property>
+
+<property>
+  <name>mapred.job.tracker.persist.jobstatus.hours</name>
+  <value>1</value>
+  <description>The number of hours job status information is persisted in DFS.
+    The job status information will be available after it drops of the memory
+    queue and between jobtracker restarts. With a zero value the job status
+    information is not persisted at all in DFS.
+  </description>
+</property>
+
+<property>
+  <name>mapred.job.tracker.persist.jobstatus.dir</name>
+  <value></value>
+  <description>The directory where the job status information is persisted
+   in a file system to be available after it drops of the memory queue and
+   between jobtracker restarts.
+  </description>
+</property>
+
+<property>
+  <name>mapred.jobtracker.retirejob.check</name>
+  <value>10000</value>
+</property>
+
+<property>
+  <name>mapred.jobtracker.retirejob.interval</name>
+  <value>21600000</value>
+</property>
+
+<property>
+  <name>mapred.job.tracker.history.completed.location</name>
+  <value>/mapred/history/done</value>
+  <description>No description</description>
+</property>
+
+<property>
+  <name>mapred.task.maxvmem</name>
+  <value></value>
+  <final>true</final>
+   <description>No description</description>
+</property>
+
+<property>
+  <name>mapred.jobtracker.maxtasks.per.job</name>
+  <value></value>
+  <final>true</final>
+  <description>The maximum number of tasks for a single job.
+  A value of -1 indicates that there is no maximum.  </description>
+</property>
+
+<property>
+  <name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
+  <value>false</value>
+</property>
+
+<property>
+  <name>mapred.userlog.retain.hours</name>
+  <value></value>
+</property>
+
+<property>
+  <name>mapred.job.reuse.jvm.num.tasks</name>
+  <value>1</value>
+  <description>
+    How many tasks to run per jvm. If set to -1, there is no limit
+  </description>
+  <final>true</final>
+</property>
+
+<property>
+  <name>mapreduce.jobtracker.kerberos.principal</name>
+  <value></value>
+  <description>
+      JT user name key.
+ </description>
+</property>
+
+<property>
+  <name>mapreduce.tasktracker.kerberos.principal</name>
+   <value></value>
+  <description>
+       tt user name key. "_HOST" is replaced by the host name of the task tracker.
+   </description>
+</property>
+
+
+  <property>
+    <name>hadoop.job.history.user.location</name>
+    <value>none</value>
+    <final>true</final>
+  </property>
+
+
+ <property>
+   <name>mapreduce.jobtracker.keytab.file</name>
+   <value></value>
+   <description>
+       The keytab for the jobtracker principal.
+   </description>
+
+</property>
+
+ <property>
+   <name>mapreduce.tasktracker.keytab.file</name>
+   <value></value>
+    <description>The filename of the keytab for the task tracker</description>
+ </property>
+
+ <property>
+   <name>mapreduce.jobtracker.staging.root.dir</name>
+   <value>/user</value>
+ <description>The Path prefix for where the staging directories should be placed. The next level is always the user's
+   name. It is a path in the default file system.</description>
+ </property>
+
+ <property>
+      <name>mapreduce.tasktracker.group</name>
+      <value>hadoop</value>
+      <description>The group that the task controller uses for accessing the task controller. The mapred user must be a member and users should *not* be members.</description>
+
+ </property>
+
+  <property>
+    <name>mapreduce.jobtracker.split.metainfo.maxsize</name>
+    <value>50000000</value>
+    <final>true</final>
+     <description>If the size of the split metainfo file is larger than this, the JobTracker will fail the job during
+    initialize.
+   </description>
+  </property>
+  <property>
+    <name>mapreduce.history.server.embedded</name>
+    <value>false</value>
+    <description>Should job history server be embedded within Job tracker
+process</description>
+    <final>true</final>
+  </property>
+
+  <property>
+    <name>mapreduce.history.server.http.address</name>
+    <!-- cluster variant -->
+    <value></value>
+    <description>Http address of the history server</description>
+    <final>true</final>
+  </property>
+
+  <property>
+    <name>mapreduce.jobhistory.kerberos.principal</name>
+    <!-- cluster variant -->
+  <value></value>
+    <description>Job history user name key. (must map to same user as JT
+user)</description>
+  </property>
+
+ <property>
+   <name>mapreduce.jobhistory.keytab.file</name>
+    <!-- cluster variant -->
+   <value></value>
+   <description>The keytab for the job history server principal.</description>
+ </property>
+
+<property>
+  <name>mapred.jobtracker.blacklist.fault-timeout-window</name>
+  <value>180</value>
+  <description>
+    3-hour sliding window (value is in minutes)
+  </description>
+</property>
+
+<property>
+  <name>mapred.jobtracker.blacklist.fault-bucket-width</name>
+  <value>15</value>
+  <description>
+    15-minute bucket size (value is in minutes)
+  </description>
+</property>
+
+<property>
+  <name>mapred.queue.names</name>
+  <value>default</value>
+  <description> Comma separated list of queues configured for this jobtracker.</description>
+</property>
+
+<property>
+  <name>mapreduce.shuffle.port</name>
+  <value>8081</value>
+  <description>Default port that the ShuffleHandler will run on. ShuffleHandler is a service run at the NodeManager to facilitate transfers of intermediate Map outputs to requesting Reducers.</description>
+</property>
+
+<property>
+  <name>mapreduce.jobhistory.intermediate-done-dir</name>
+  <value>/mr-history/tmp</value>
+  <description>Directory where history files are written by MapReduce jobs.</description>
+</property>
+
+<property>
+  <name>mapreduce.jobhistory.done-dir</name>
+  <value>/mr-history/done</value>
+  <description>Directory where history files are managed by the MR JobHistory Server.</description>
+</property>
+
+</configuration>

Added: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml Thu May 30 22:14:29 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+   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.
+-->
+<metainfo>
+    <user>mapred</user>
+    <comment>Apache Hadoop NextGen MapReduce (client libraries)</comment>
+    <version>2.0.3.22-1</version>
+    <components>
+        <component>
+            <name>HISTORYSERVER</name>
+            <category>MASTER</category>
+        </component>
+        <component>
+            <name>MAPREDUCEv2_CLIENT</name>
+            <category>CLIENT</category>
+        </component>
+    </components>
+</metainfo>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5.22-1</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/stacks/HDPLocal/1.3.0/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5.1.3.0.0</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.3.0.sql Thu May 30 22:14:29 2013
@@ -26,6 +26,8 @@ ALTER TABLE ambari.hosts
 ALTER TABLE ambari.clusterstate
   ADD COLUMN current_stack_version VARCHAR(255) NOT NULL;
 
+CREATE TABLE ambari.metainfo ("metainfo_key" VARCHAR(255), "metainfo_value" VARCHAR, PRIMARY KEY("metainfo_key"));
+GRANT ALL PRIVILEGES ON TABLE ambari.metainfo TO :username;
 
 CREATE TABLE ambari.hostconfigmapping (cluster_id bigint NOT NULL, host_name VARCHAR(255) NOT NULL, type_name VARCHAR(255) NOT NULL, version_tag VARCHAR(255) NOT NULL, service_name VARCHAR(255), create_timestamp BIGINT NOT NULL, selected INTEGER NOT NULL DEFAULT 0, user_name VARCHAR(255) NOT NULL DEFAULT '_db', PRIMARY KEY (cluster_id, host_name, type_name, create_timestamp));
 GRANT ALL PRIVILEGES ON TABLE ambari.hostconfigmapping TO :username;
@@ -55,48 +57,10 @@ drop sequence ambari.host_role_command_t
 drop sequence ambari.users_user_id_seq;
 drop sequence ambari.clusters_cluster_id_seq;
 
-CREATE LANGUAGE plpgsql;
-
 BEGIN;
 
-CREATE OR REPLACE FUNCTION create_or_update_metainfo_table(ambariVersion VARCHAR, userName TEXT) RETURNS text AS
-$$
-DECLARE
-    version VARCHAR(255) := 'version';
-    fqtn text := 'ambari.metainfo';
-BEGIN
-    IF NOT EXISTS (SELECT * FROM pg_tables WHERE tablename = 'metainfo') THEN
-        EXECUTE 'CREATE TABLE '
-        || fqtn
-        || ' (metainfo_key VARCHAR(255), metainfo_value VARCHAR, PRIMARY KEY(metainfo_key));';
-        EXECUTE 'GRANT ALL PRIVILEGES ON TABLE '
-        || fqtn
-        || ' TO '
-        || $2
-        || ';';
-        EXECUTE 'INSERT INTO '
-        || fqtn
-        || '(metainfo_key, metainfo_value) select '
-        || quote_literal(version)
-        || ','
-        || quote_literal($1)
-        || ';';
-        RETURN 'INFO: metainfo was created';
-    ELSE
-        EXECUTE 'UPDATE '
-        || fqtn
-        || ' SET metainfo_value = '
-        || quote_literal($1)
-        || ' WHERE metainfo_key = '
-        || quote_literal(version)
-        || ';';
-        RETURN 'INFO: metainfo was updated';
-    END IF;
-END;
-$$
-LANGUAGE 'plpgsql';
-
-SELECT create_or_update_metainfo_table('${ambariVersion}',:username);
+insert into ambari.metainfo(metainfo_key, metainfo_value)
+select 'version','1.3.0';
 
 COMMIT;
 
@@ -105,6 +69,8 @@ UPDATE ambari.hostcomponentstate SET cur
 
 -- service to cluster level config mappings move. idempotent update
 
+CREATE LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION update_clusterconfigmapping()
   RETURNS void AS
 $_$

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java Thu May 30 22:14:29 2013
@@ -82,7 +82,7 @@ public class AmbariMetaInfoTest {
   public void before() throws Exception {
     File stackRoot = new File("src/test/resources/stacks");
    LOG.info("Stacks file " + stackRoot.getAbsolutePath());
-    metaInfo = new AmbariMetaInfo(stackRoot, new File("target/version"));
+    metaInfo = new AmbariMetaInfo(stackRoot, new File("../version"));
     try {
       metaInfo.init();
     } catch(Exception e) {
@@ -280,7 +280,7 @@ public class AmbariMetaInfoTest {
     File stackRoot = new File("src/test/resources/stacks");
     File stackRootTmp = new File(buildDir + "/ambari-metaInfo"); stackRootTmp.mkdir();
     FileUtils.copyDirectory(stackRoot, stackRootTmp);
-    AmbariMetaInfo ambariMetaInfo = new AmbariMetaInfo(stackRootTmp, new File("target/version"));
+    AmbariMetaInfo ambariMetaInfo = new AmbariMetaInfo(stackRootTmp, new File("../version"));
     File f1, f2, f3;
     f1 = new File(stackRootTmp.getAbsolutePath() + "/001.svn"); f1.createNewFile();
     f2 = new File(stackRootTmp.getAbsolutePath() + "/abcd.svn/001.svn"); f2.mkdirs(); f2.createNewFile();

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaServiceTest.java Thu May 30 22:14:29 2013
@@ -67,7 +67,7 @@ public class AmbariMetaServiceTest exten
     AmbariMetaInfo ambariMetaInfo;
     
     public MockModule() throws Exception {
-      this.ambariMetaInfo = new AmbariMetaInfo(stackRoot, new File("target/version"));
+      this.ambariMetaInfo = new AmbariMetaInfo(stackRoot, new File("../version"));
     }
 
     @Override
@@ -108,4 +108,4 @@ public class AmbariMetaServiceTest exten
     ServiceInfo info = mapper.readValue(output, ServiceInfo.class);
     Assert.assertEquals("HDFS", info.getName());
   }
-}
+}
\ No newline at end of file

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java Thu May 30 22:14:29 2013
@@ -1479,7 +1479,7 @@ public class AmbariManagementControllerI
         properties.setProperty(Configuration.METADETA_DIR_PATH,
             "src/main/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,
-                "target/version");
+                "../version");
         properties.setProperty(Configuration.OS_VERSION_KEY,
             "centos5");
         try {

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java Thu May 30 22:14:29 2013
@@ -149,7 +149,7 @@ public class GangliaPropertyProviderTest
     Request  request = PropertyHelper.getReadRequest(Collections.singleton(PROPERTY_ID), temporalInfoMap);
 
     Assert.assertEquals(3, propertyProvider.populateResources(resources, request, null).size());
-    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPSlaves,HDPNameNode&h=domU-12-31-39-0E-34-E3.compute-1.internal,domU-12-31-39-0E-34-E1.compute-1.internal,domU-12-31-39-0E-34-E2.compute-1.internal&m=jvm.metrics.gcCount&s=10&e=20&r=1",
         streamProvider.getLastSpec());
 
     for (Resource res : resources) {
@@ -186,7 +186,7 @@ public class GangliaPropertyProviderTest
 
     Assert.assertEquals(150, propertyProvider.populateResources(resources, request, null).size());
 
-    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPResourceManager,HDPSlaves,HDPHistoryServer,HDPNameNode&m=jvm.metrics.gcCount&s=10&e=20&r=1",
+    Assert.assertEquals("http://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPJobTracker,HDPHBaseMaster,HDPSlaves,HDPNameNode&m=jvm.metrics.gcCount&s=10&e=20&r=1",
         streamProvider.getLastSpec());
 
   }

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java Thu May 30 22:14:29 2013
@@ -63,13 +63,5 @@ public class RoleGraphTest {
     Assert.assertEquals(1, rco.order(nagios_server_install, mapred_client_install));
     Assert.assertEquals(1, rco.order(nagios_server_install, hcat_client_install));
     Assert.assertEquals(1, rco.order(nagios_server_install, oozie_client_install));
-
-    RoleGraphNode pig_service_check = new RoleGraphNode(Role.PIG_SERVICE_CHECK, RoleCommand.EXECUTE);
-    RoleGraphNode resourcemanager_start = new RoleGraphNode(Role.RESOURCEMANAGER, RoleCommand.START);
-    Assert.assertEquals(-1, rco.order(resourcemanager_start, pig_service_check));
-
-    RoleGraphNode hdfs_service_check = new RoleGraphNode(Role.HDFS_SERVICE_CHECK, RoleCommand.EXECUTE);
-    RoleGraphNode snamenode_start = new RoleGraphNode(Role.SECONDARY_NAMENODE, RoleCommand.START);
-    Assert.assertEquals(-1, rco.order(snamenode_start, hdfs_service_check));
   }
 }

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java Thu May 30 22:14:29 2013
@@ -33,7 +33,7 @@ public class InMemoryDefaultTestModule e
     properties.setProperty(Configuration.METADETA_DIR_PATH,
         "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,
-            "target/version");
+            "../version");
     properties.setProperty(Configuration.OS_VERSION_KEY,
         "centos5");
     try {

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java Thu May 30 22:14:29 2013
@@ -35,7 +35,7 @@ public class AuthorizationTestModule ext
     properties.setProperty(Configuration.METADETA_DIR_PATH,
         "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,
-        "target/version");
+        "../version");
     properties.setProperty(Configuration.OS_VERSION_KEY,
         "centos5");
 

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>1.0</version>
 
 

Modified: incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml Thu May 30 22:14:29 2013
@@ -17,7 +17,7 @@
 -->
 <metainfo>
     <user>root</user>
-    <comment>Centralized service which provides highly reliable distributed coordination</comment>
+    <comment>This is comment for ZOOKEEPER service</comment>
     <version>3.4.5</version>
 
     <components>

Modified: incubator/ambari/branches/branch-1.2.4/ambari-web/app/app.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/app.js?rev=1488039&r1=1488038&r2=1488039&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/app.js (original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/app.js Thu May 30 22:14:29 2013
@@ -51,10 +51,7 @@ module.exports = Em.Application.create({
     return '/stacks2/HDP/versions/' + stackVersion.replace(/HDP-/g, '');
   }.property('currentStackVersion'),
   clusterName: null,
-  currentStackVersion: '',
-  currentStackVersionNumber: function(){
-    return this.get('currentStackVersion').replace(/HDP(Local)?-/, '');
-  }.property('currentStackVersion')
+  currentStackVersion: null
 });
 
 /**

Added: incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HBASE.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HBASE.json?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HBASE.json (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HBASE.json Thu May 30 22:14:29 2013
@@ -0,0 +1,60 @@
+{
+  "name" : "HBASE",
+  "version" : "0.94.5",
+  "user" : "mapred",
+  "comment" : "Non-relational distributed database and centralized service for configuration management & synchronization",
+  "properties" : [ {
+    "name" : "hbase.cluster.distributed",
+    "value" : "true",
+    "description" : "The mode the cluster will be in. Possible values are\n      false for standalone mode and true for distributed mode.  If\n      false, startup will run all HBase and ZooKeeper daemons together\n      in the one JVM.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.master.lease.thread.wakefrequency",
+    "value" : "3000",
+    "description" : "The interval between checks for expired region server leases.\n    This value has been reduced due to the other reduced values above so that\n    the master will notice a dead region server sooner. The default is 15 seconds.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.superuser",
+    "value" : "hbase",
+    "description" : "List of users or groups (comma-separated), who are allowed\n    full privileges, regardless of stored ACLs, across the cluster.\n    Only used when HBase security is enabled.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.zookeeper.property.clientPort",
+    "value" : "2181",
+    "description" : "Property from ZooKeeper's config zoo.cfg.\n    The port at which the clients will connect.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.regionserver.optionalcacheflushinterval",
+    "value" : "10000",
+    "description" : "\n      Amount of time to wait since the last time a region was flushed before\n      invoking an optional cache flush. Default 60,000.\n    ",
+    "filename" : "hbase-site.xml"
+  }, {
+    "name" : "hbase.zookeeper.useMulti",
+    "value" : "true",
+    "description" : "Instructs HBase to make use of ZooKeeper's multi-update functionality.\n    This allows certain ZooKeeper operations to complete more quickly and prevents some issues\n    with rare Replication failure scenarios (see the release note of HBASE-2611 for an example).åá\n    IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+\n    and will not be downgraded.  ZooKeeper versions before 3.4 do not support multi-update and will\n    not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).\n    ",
+    "filename" : "hbase-site.xml"
+  } ],
+  "components" : [ {
+    "name" : "HBASE_MASTER",
+    "category" : "MASTER",
+    "client" : false,
+    "master" : true
+  }, {
+    "name" : "HBASE_REGIONSERVER",
+    "category" : "SLAVE",
+    "client" : false,
+    "master" : false
+  }, {
+    "name" : "HBASE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : false,
+  "clientComponent" : {
+    "name" : "HBASE_CLIENT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  }
+}
\ No newline at end of file

Added: incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HCATALOG.json
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HCATALOG.json?rev=1488039&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HCATALOG.json (added)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/assets/data/wizard/stack/hdp/version122/HCATALOG.json Thu May 30 22:14:29 2013
@@ -0,0 +1,20 @@
+{
+  "name" : "HCATALOG",
+  "version" : "0.5.0",
+  "user" : "root",
+  "comment" : "This is comment for HCATALOG service",
+  "properties" : [ ],
+  "components" : [ {
+    "name" : "HCAT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  } ],
+  "clientOnlyService" : true,
+  "clientComponent" : {
+    "name" : "HCAT",
+    "category" : "CLIENT",
+    "client" : true,
+    "master" : false
+  }
+}
\ No newline at end of file



Mime
View raw message