Skip to content

Commit

Permalink
fix: chown fail when OS create folders or files with root only permis…
Browse files Browse the repository at this point in the history 
…sion

Signed-off-by: Tiến Nguyễn Khắc <[email protected]>
(cherry picked from commit cff9793)
  • Loading branch information
@tien @FlorianHockmann
tien authored and FlorianHockmann committed May 14, 2024
1 parent 003bdf9 commit 04fb7fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions janusgraph-dist/docker/docker-entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ JANUSGRAPH_SERVER_YAML="${JANUS_CONFIG_DIR}/janusgraph-server.yaml"
# running as root; step down to run as janusgraph user
if [ "$1" == 'janusgraph' ] && [ "$(id -u)" == "0" ]; then
mkdir -p ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chown -R janusgraph:janusgraph ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chown janusgraph:janusgraph ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chmod 700 ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}

exec chroot --skip-chdir --userspec janusgraph:janusgraph / "${BASH_SOURCE}" "$@"
Expand All @@ -32,7 +32,7 @@ if [ "$1" == 'janusgraph' ]; then
mkdir -p ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
cp conf/janusgraph-${JANUS_PROPS_TEMPLATE}-server.properties ${JANUS_PROPS}
cp conf/janusgraph-server.yaml ${JANUSGRAPH_SERVER_YAML}
chown -R "$(id -u):$(id -g)" ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chown "$(id -u):$(id -g)" ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chmod 700 ${JANUS_DATA_DIR} ${JANUS_CONFIG_DIR}
chmod -R 600 ${JANUS_CONFIG_DIR}/*

Expand Down

1 comment on commit 04fb7fd

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 04fb7fd Previous: c8792aa Ratio
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 12599.441344712663 ms/op 12933.219068971923 ms/op 0.97
org.janusgraph.GraphCentricQueryBenchmark.getVertices 933.1183193536106 ms/op 929.0686750649414 ms/op 1.00
org.janusgraph.MgmtOlapJobBenchmark.runClearIndex 216.5904647768116 ms/op 215.98180543333334 ms/op 1.00
org.janusgraph.MgmtOlapJobBenchmark.runReindex 335.1630306458334 ms/op 348.8265452326923 ms/op 0.96
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 238.12869699782178 ms/op 227.8074437066411 ms/op 1.05
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 4949.052398031048 ms/op 4880.398383755226 ms/op 1.01
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingEmitRepeatSteps 17450.637947891348 ms/op 17909.154248616192 ms/op 0.97
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithSmallBatch 20817.245282759395 ms/op 18799.44054118485 ms/op 1.11
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.vertexCentricPropertiesFetching 55346.89793600001 ms/op 55455.590322899996 ms/op 1.00
org.janusgraph.CQLMultiQueryBenchmark.getAllElementsTraversedFromOuterVertex 8490.851993615812 ms/op 8339.218499689177 ms/op 1.02
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithDoubleUnion 382.29805737493444 ms/op 371.31223395833683 ms/op 1.03
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesAllPropertiesWithUnlimitedBatch 4044.7829326024384 ms/op 4227.4425002369935 ms/op 0.96
org.janusgraph.CQLMultiQueryBenchmark.getNames 8448.899522966933 ms/op 8528.923591561108 ms/op 0.99
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesThreePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 5938.637573993798 ms/op 5366.416493988495 ms/op 1.11
org.janusgraph.CQLMultiQueryBenchmark.getLabels 7206.822391839452 ms/op 7119.612218557372 ms/op 1.01
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFilteredByAndStep 424.7113174154762 ms/op 416.6330074327548 ms/op 1.02
org.janusgraph.CQLMultiQueryBenchmark.getVerticesFromMultiNestedRepeatStepStartingFromSingleVertex 12808.32837593746 ms/op 13040.1543998325 ms/op 0.98
org.janusgraph.CQLMultiQueryBenchmark.getVerticesWithCoalesceUsage 364.59275898298426 ms/op 366.6865794040481 ms/op 0.99
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithAllMultiQuerySlicesUnderMaxRequestsPerConnection 14135.882705472275 ms/op 14169.280107965806 ms/op 1.00
org.janusgraph.CQLMultiQueryBenchmark.getIdToOutVerticesProjection 253.12517782503184 ms/op 243.11426684096145 ms/op 1.04
org.janusgraph.CQLMultiQueryMultiSlicesBenchmark.getValuesMultiplePropertiesWithUnlimitedBatch 14412.361449701857 ms/op 14724.027508337518 ms/op 0.98
org.janusgraph.CQLMultiQueryBenchmark.getNeighborNames 8626.823017756476 ms/op 8379.61509861012 ms/op 1.03
org.janusgraph.CQLMultiQueryBenchmark.getElementsWithUsingRepeatUntilSteps 9235.310294767567 ms/op 9197.912189783667 ms/op 1.00
org.janusgraph.CQLMultiQueryBenchmark.getAdjacentVerticesLocalCounts 8835.472310112713 ms/op 8786.588147997933 ms/op 1.01

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.