Repository: kudu
Updated Branches:
refs/heads/master 53183f1e5 -> 95d979888
[kudu-jepsen] standardize layout of test resource files
The kudu-jepsen resources were located under ./resources sub-directory
(instead of the 'standard' layout of ./src/{main,test}/resources).
After switching to gradle build, the files under ./resources are no
longer put into corresponding JARs since gradle is unaware of the
custom resource sub-directory. Instead adding the ./resources
sub-directory into the list of resources directories for gradle,
let's just move it to comply with the standard resources layout.
Change-Id: Idf4f6224c301c8246848cad74d8a848b77e9de0c
Reviewed-on: http://gerrit.cloudera.org:8080/11769
Reviewed-by: Grant Henke <granthe...@apache.org>
Tested-by: Alexey Serbin <aser...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/95d97988
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/95d97988
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/95d97988
Branch: refs/heads/master
Commit: 95d9798886cc8ecbfcaf84a86a610b4fcb656a60
Parents: 53183f1
Author: Alexey Serbin <aser...@cloudera.com>
Authored: Wed Oct 24 12:43:12 2018 -0700
Committer: Alexey Serbin <aser...@cloudera.com>
Committed: Wed Oct 24 21:30:02 2018 +0000
----------------------------------------------------------------------
java/kudu-jepsen/resources/kudu.flags | 28 ------------------
java/kudu-jepsen/resources/ntp.conf.common | 30 --------------------
java/kudu-jepsen/resources/ntp.conf.server | 20 -------------
java/kudu-jepsen/src/test/resources/kudu.flags | 28 ++++++++++++++++++
.../src/test/resources/ntp.conf.common | 30 ++++++++++++++++++++
.../src/test/resources/ntp.conf.server | 20 +++++++++++++
6 files changed, 78 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/resources/kudu.flags
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/resources/kudu.flags
b/java/kudu-jepsen/resources/kudu.flags
deleted file mode 100644
index f92461a..0000000
--- a/java/kudu-jepsen/resources/kudu.flags
+++ /dev/null
@@ -1,28 +0,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.
-
-# This overrides all flags in a flag file.
-#
-# The block cache capacity is set to not exceed 1/2 of the effective
-# memory pressure threshold on smaller machines: current Kudu Jepsen
-# tests do not require a lot of memory of block cache capacity around.
-# An alternative approach would be replacing that with the
-# --force_block_cache_capacity flag.
---unlock_experimental_flags
---unlock_unsafe_flags
---block_cache_capacity_mb=128
---logtostderr
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/resources/ntp.conf.common
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/resources/ntp.conf.common
b/java/kudu-jepsen/resources/ntp.conf.common
deleted file mode 100644
index 6543eb1..0000000
--- a/java/kudu-jepsen/resources/ntp.conf.common
+++ /dev/null
@@ -1,30 +0,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.
-
-tinker panic 0
-enable kernel
-enable ntp
-enable stats
-statistics loopstats peerstats clockstats sysstats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-filegen sysstats file sysstats type day enable
-logconfig =syncall +clockall +sysall +peerall
-logfile /var/log/ntpd.log
-statsdir /var/log/ntpstats/
-driftfile /var/lib/ntp/ntp.drift
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/resources/ntp.conf.server
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/resources/ntp.conf.server
b/java/kudu-jepsen/resources/ntp.conf.server
deleted file mode 100644
index 6657f10..0000000
--- a/java/kudu-jepsen/resources/ntp.conf.server
+++ /dev/null
@@ -1,20 +0,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.
-#
-enable calibrate
-server 127.127.1.0 burst iburst minpoll 4 maxpoll 4
-fudge 127.127.1.0 stratum 10
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/src/test/resources/kudu.flags
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/src/test/resources/kudu.flags
b/java/kudu-jepsen/src/test/resources/kudu.flags
new file mode 100644
index 0000000..f92461a
--- /dev/null
+++ b/java/kudu-jepsen/src/test/resources/kudu.flags
@@ -0,0 +1,28 @@
+# 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.
+
+# This overrides all flags in a flag file.
+#
+# The block cache capacity is set to not exceed 1/2 of the effective
+# memory pressure threshold on smaller machines: current Kudu Jepsen
+# tests do not require a lot of memory of block cache capacity around.
+# An alternative approach would be replacing that with the
+# --force_block_cache_capacity flag.
+--unlock_experimental_flags
+--unlock_unsafe_flags
+--block_cache_capacity_mb=128
+--logtostderr
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/src/test/resources/ntp.conf.common
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/src/test/resources/ntp.conf.common
b/java/kudu-jepsen/src/test/resources/ntp.conf.common
new file mode 100644
index 0000000..6543eb1
--- /dev/null
+++ b/java/kudu-jepsen/src/test/resources/ntp.conf.common
@@ -0,0 +1,30 @@
+# 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.
+
+tinker panic 0
+enable kernel
+enable ntp
+enable stats
+statistics loopstats peerstats clockstats sysstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+filegen sysstats file sysstats type day enable
+logconfig =syncall +clockall +sysall +peerall
+logfile /var/log/ntpd.log
+statsdir /var/log/ntpstats/
+driftfile /var/lib/ntp/ntp.drift
http://git-wip-us.apache.org/repos/asf/kudu/blob/95d97988/java/kudu-jepsen/src/test/resources/ntp.conf.server
----------------------------------------------------------------------
diff --git a/java/kudu-jepsen/src/test/resources/ntp.conf.server
b/java/kudu-jepsen/src/test/resources/ntp.conf.server
new file mode 100644
index 0000000..6657f10
--- /dev/null
+++ b/java/kudu-jepsen/src/test/resources/ntp.conf.server
@@ -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.
+#
+enable calibrate
+server 127.127.1.0 burst iburst minpoll 4 maxpoll 4
+fudge 127.127.1.0 stratum 10
