Skip to content

Commit cc867e8

Browse files
authored
Remove /var/run/elasticsearch from packages (elastic#41102)
The pid dir for both systemd and init.d is already managed by those respective systems (tmpfiles.d and the init script, respectively). Since the /var/run dir is often mounted as tmpfs, it does not make sense to have the elasticsearch pid dir added by the package installation. This commit removes that empty dir from deb and rpm.
1 parent 67d4e39 commit cc867e8

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

distribution/packages/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ void addProcessFilesTask(String type, boolean oss, boolean jdk) {
8181

8282
doLast {
8383
// create empty dirs, we set the permissions when configuring the packages
84-
mkdir "${packagingFiles}/var/run/elasticsearch"
8584
mkdir "${packagingFiles}/var/log/elasticsearch"
8685
mkdir "${packagingFiles}/var/lib/elasticsearch"
8786
mkdir "${packagingFiles}/usr/share/elasticsearch/plugins"
@@ -253,7 +252,6 @@ Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
253252
dirMode mode
254253
}
255254
}
256-
copyEmptyDir('/var/run/elasticsearch', 'elasticsearch', 'elasticsearch', 0755)
257255
copyEmptyDir('/var/log/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
258256
copyEmptyDir('/var/lib/elasticsearch', 'elasticsearch', 'elasticsearch', 02750)
259257
copyEmptyDir('/usr/share/elasticsearch/plugins', 'root', 'root', 0755)

qa/vagrant/src/main/java/org/elasticsearch/packaging/util/Packages.java

-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ private static void verifyOssInstallation(Installation es, Distribution distribu
173173
es.modules
174174
).forEach(dir -> assertThat(dir, file(Directory, "root", "root", p755)));
175175

176-
assertThat(es.pidDir, file(Directory, "elasticsearch", "elasticsearch", p755));
177-
178176
Stream.of(
179177
es.data,
180178
es.logs

qa/vagrant/src/test/resources/packaging/utils/packages.bash

-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export_elasticsearch_paths() {
4747
export ESCONFIG="/etc/elasticsearch"
4848
export ESDATA="/var/lib/elasticsearch"
4949
export ESLOG="/var/log/elasticsearch"
50-
export ESPIDDIR="/var/run/elasticsearch"
5150
export ESENVFILE=$(env_file)
5251
export PACKAGE_NAME=${PACKAGE_NAME:-"elasticsearch-oss"}
5352
}
@@ -132,7 +131,6 @@ verify_package_installation() {
132131
assert_file "$ESLOG" d elasticsearch elasticsearch 2750
133132
assert_file "$ESPLUGINS" d root root 755
134133
assert_file "$ESMODULES" d root root 755
135-
assert_file "$ESPIDDIR" d elasticsearch elasticsearch 755
136134
assert_file "$ESHOME/NOTICE.txt" f root root 644
137135
assert_file "$ESHOME/README.textile" f root root 644
138136

0 commit comments

Comments
 (0)