Repository: incubator-myriad Updated Branches: refs/heads/master 7aea259cf -> 577c30b1a
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/577c30b1/myriad-scheduler/src/test/java/org/apache/myriad/state/utils/ByteBufferSupportTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/state/utils/ByteBufferSupportTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/state/utils/ByteBufferSupportTest.java index 9d4dac5..49edf3f 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/state/utils/ByteBufferSupportTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/state/utils/ByteBufferSupportTest.java @@ -1,3 +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 + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * 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. + */ package org.apache.myriad.state.utils; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/577c30b1/myriad-scheduler/src/test/java/org/apache/myriad/webapp/HttpConnectorProviderTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/webapp/HttpConnectorProviderTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/webapp/HttpConnectorProviderTest.java index 5c4dd7d..d5665cc 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/webapp/HttpConnectorProviderTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/webapp/HttpConnectorProviderTest.java @@ -1,3 +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 + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * 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. + */ package org.apache.myriad.webapp; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/577c30b1/myriad-scheduler/src/test/java/org/apache/myriad/webapp/MyriadWebServerTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/webapp/MyriadWebServerTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/webapp/MyriadWebServerTest.java index 31c7119..c86a508 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/webapp/MyriadWebServerTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/webapp/MyriadWebServerTest.java @@ -1,3 +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 + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * 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. + */ package org.apache.myriad.webapp; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/577c30b1/myriad-scheduler/src/test/resources/myriad-config-test-default.yml ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/resources/myriad-config-test-default.yml b/myriad-scheduler/src/test/resources/myriad-config-test-default.yml index d07a318..18cd830 100644 --- a/myriad-scheduler/src/test/resources/myriad-config-test-default.yml +++ b/myriad-scheduler/src/test/resources/myriad-config-test-default.yml @@ -44,9 +44,10 @@ profiles: rebalancer: nodemanager: - jvmMaxMemoryMB: 1024 - cpus: 0.2 + jvmMaxMemoryMB: 2048 + cpus: 0.8 cgroups: false + maxCpus: 4 executor: jvmMaxMemoryMB: 256 path: file:///usr/local/libexec/mesos/myriad-executor-runnable-0.1.0.jar @@ -60,20 +61,20 @@ yarnEnvironment: mesosAuthenticationPrincipal: mesosAuthenticationSecretFilename: services: - jobhistory: - maxInstances: 1 - jvmMaxMemoryMB: 1024 - cpus: 1 - ports: - myriad.mapreduce.jobhistory.admin.address: 0 - myriad.mapreduce.jobhistory.address: 0 - myriad.mapreduce.jobhistory.webapp.address: 1 - command: bin/mapred historyserver - envSettings: -Dcluster.name.prefix=/mycluster - taskName: jobhistory - timelineserver: - jvmMaxMemoryMB: 1024 - cpus: 1 - envSettings: -Dcluster.name.prefix=/mycluster2 - taskName: timelineserver - command: bin/mapred historyserver + jobhistory: + maxInstances: 2 + jvmMaxMemoryMB: 1024 + cpus: 1 + ports: + myriad.mapreduce.jobhistory.admin.address: 0 + myriad.mapreduce.jobhistory.address: 0 + myriad.mapreduce.jobhistory.webapp.address: 0 + command: bin/mapred historyserver + envSettings: -Dcluster.name.prefix=/mycluster + taskName: jobhistory + timelineserver: + jvmMaxMemoryMB: 1024 + cpus: 1 + envSettings: -Dcluster.name.prefix=/mycluster2 + taskName: timelineserver + command: bin/mapred historyserver
