aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorartem-trof <artem-trof@yandex-team.com>2023-01-27 15:11:27 +0300
committerartem-trof <artem-trof@yandex-team.com>2023-01-27 15:11:27 +0300
commitc9ffd5710bf14bbec3963f79dc728137bbe1cd7b (patch)
tree3d70ba73128290a1c37b36797e337c4f0e6bd31b
parent93f7a7104bfd749f5bcbbb7d5c073abc7ce03554 (diff)
downloadydb-c9ffd5710bf14bbec3963f79dc728137bbe1cd7b.tar.gz
Add ydb oss configs
ydbops-6678: add draft config for ydb-oss testing
-rwxr-xr-xydb/deploy/packages/ydb-server/ydb-server-storage-start.sh19
-rw-r--r--ydb/deploy/packages/ydb-server/ydb-server-storage.service27
-rwxr-xr-xydb/deploy/packages/ydb-server/ydb-server.postinstall52
-rw-r--r--ydb/deploy/packages/ydb-server/ydb-server.template.yaml10
4 files changed, 86 insertions, 22 deletions
diff --git a/ydb/deploy/packages/ydb-server/ydb-server-storage-start.sh b/ydb/deploy/packages/ydb-server/ydb-server-storage-start.sh
new file mode 100755
index 00000000000..d5bcd5ef08e
--- /dev/null
+++ b/ydb/deploy/packages/ydb-server/ydb-server-storage-start.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+opt="/opt/ydb"
+optional_args=""
+
+if [ -f "$opt/token/ydbd.token" ]; then
+ optional_args="--auth-token-file $opt/token/ydbd.token"
+fi
+
+exec $opt/bin/ydbd server \
+ --log-level 3 \
+ --syslog \
+ --tcp \
+ --yaml-config $opt/cfg/config.yaml \
+ --grpc-port 2135 \
+ --ic-port 19001 \
+ --mon-port 8765 \
+ --node static $optional_args
diff --git a/ydb/deploy/packages/ydb-server/ydb-server-storage.service b/ydb/deploy/packages/ydb-server/ydb-server-storage.service
index ece40a9b156..85a0d50cdad 100644
--- a/ydb/deploy/packages/ydb-server/ydb-server-storage.service
+++ b/ydb/deploy/packages/ydb-server/ydb-server-storage.service
@@ -1,25 +1,36 @@
[Unit]
Description=YDB storage node
-After=network-online.target rc-local.service
-Wants=network-online.target
StartLimitInterval=10
StartLimitBurst=15
+AssertFileNotEmpty=/opt/ydb/cfg/config.yaml
+After=network-online.target rc-local.service
+Wants=network-online.target
[Service]
-Restart=always
-RestartSec=1
+Type=simple
User=ydb
+LimitNOFILE=65536
+LimitCORE=0
+LimitMEMLOCK=3221225472
+
PermissionsStartOnly=true
+CapabilityBoundingSet=CAP_SETFCAP CAP_SYS_RAWIO CAP_SYS_NICE
+
StandardOutput=syslog
StandardError=syslog
SyslogIdentifier=ydbd
SyslogFacility=daemon
SyslogLevel=err
+
+ExecStartPre=/usr/bin/install -o ydb -d /opt/ydb/cache
Environment=LD_LIBRARY_PATH=/opt/ydb/lib
-ExecStart=/opt/ydb/bin/ydbd server --log-level 3 --syslog --tcp --yaml-config /opt/ydb/cfg/config.yaml --grpc-port 2135 --ic-port 19001 --mon-port 8765 --node static
-LimitNOFILE=65536
-LimitCORE=0
-LimitMEMLOCK=3221225472
+ExecStart=/opt/ydb/bin/ydb-server-storage-start.sh
+
+KillMode=mixed
+TimeoutStopSec=300
+
+Restart=always
+RestartSec=1
[Install]
WantedBy=multi-user.target \ No newline at end of file
diff --git a/ydb/deploy/packages/ydb-server/ydb-server.postinstall b/ydb/deploy/packages/ydb-server/ydb-server.postinstall
index 241bbf6ed69..3af48bb3fff 100755
--- a/ydb/deploy/packages/ydb-server/ydb-server.postinstall
+++ b/ydb/deploy/packages/ydb-server/ydb-server.postinstall
@@ -1,11 +1,49 @@
#!/bin/sh
-# create ydb user & group
-groupadd ydb
-useradd ydb -g ydb
+set -e
-# to make sure that YDB has access to block disks to run
-usermod -aG disk ydb
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
-# fix ownership of ydb stuff
-chown -R ydb:ydb /opt/ydb
+case "$1" in
+configure)
+
+ # create ydb user & group
+ groupadd ydb
+ useradd ydb -g ydb
+
+ # to make sure that YDB has access to block disks to run
+ usermod -aG disk ydb
+
+ # fix ownership of ydb stuff
+ chown -R ydb:ydb /opt/ydb
+
+ mkdir /opt/ydb/cache
+
+ if [ -x /bin/systemctl -a -f /etc/systemd/system/ydb-server-storage.service ]; then
+ /bin/systemctl daemon-reload || true
+ if ! /bin/systemctl enable ydb-server-storage; then
+ echo "Cannot enable ydb service!"
+ fi
+ fi
+
+ ;;
+
+abort-upgrade | abort-remove | abort-deconfigure) ;;
+
+*)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/ydb/deploy/packages/ydb-server/ydb-server.template.yaml b/ydb/deploy/packages/ydb-server/ydb-server.template.yaml
index 9f283288973..29ed9727ca0 100644
--- a/ydb/deploy/packages/ydb-server/ydb-server.template.yaml
+++ b/ydb/deploy/packages/ydb-server/ydb-server.template.yaml
@@ -24,10 +24,10 @@ contents:
dst: /opt/ydb/bin/ydbd
- src: "${RELEASE_DIR}/lib/*"
dst: /opt/ydb/lib
- - src: ydb/deploy/yaml_config_examples/single-node-in-memory.yaml
- dst: /opt/ydb/cfg/config.yaml
- src: ydb/deploy/packages/ydb-server/ydb-server-storage.service
- dst: /lib/systemd/system/ydb-server/ydb-server-storage.service
+ dst: /etc/systemd/system/ydb-server-storage.service
+ - src: ydb/deploy/packages/ydb-server/ydb-server-storage-start.sh
+ dst: /opt/ydb/bin/ydb-server-storage-start.sh
- src: "${RELEASE_DIR}/AUTHORS"
dst: /usr/share/doc/ydb-server/AUTHORS
- src: "${RELEASE_DIR}/LICENSE"
@@ -37,7 +37,3 @@ contents:
scripts:
postinstall: ydb/deploy/packages/ydb-server/ydb-server.postinstall
-
-deb:
- fields:
- Source: "YDB Platform"