EZP-30463: As an Developer, I want to use Solr Cloud #137
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,16 +10,36 @@ default_cores[2]='core2' | |
| default_cores[3]='core3' | ||
| default_cores[4]='core4' | ||
|
|
||
| default_nodes=('node1:8983' 'node2:8984' 'node3:8985' 'node4:8986') | ||
| default_shards=('shard0') | ||
|
|
||
| SOLR_PORT=${SOLR_PORT:-8983} | ||
| SOLR_DIR=${SOLR_DIR:-'__solr'} | ||
| SOLR_VERSION=${SOLR_VERSION:-'6.6.5'} | ||
| SOLR_INSTALL_DIR="${SOLR_DIR}/${SOLR_VERSION}" | ||
| SOLR_DEBUG=${SOLR_DEBUG:-false} | ||
| SOLR_HOME=${SOLR_HOME:-'ezcloud'} | ||
| SOLR_CONFIG=("${SOLR_CONFIG[@]:-${default_config_files[*]}}") | ||
| SOLR_CORES=${SOLR_CORES:-${default_cores[*]}} | ||
| SOLR_SHARDS=("${SOLR_SHARDS[@]:-${default_shards[*]}}") | ||
| SOLR_NODES=("${SOLR_NODES[@]:-${default_nodes[@]}}") | ||
| SOLR_COLLECTION_NAME=${SOLR_COLLECTION_NAME:-'ezplatform'} | ||
| SOLR_CONFIGURATION_NAME=${SOLR_CONFIGURATION_NAME:-'ezconfig'} | ||
| SOLR_MAX_SHARDS_PER_NODE=${SOLR_MAX_SHARDS_PER_NODE:-'1'} | ||
| SOLR_REPLICATION_FACTOR=${SOLR_REPLICATION_FACTOR:-'1'} | ||
| SOLR_CLOUD=${SOLR_CLOUD:-'no'} | ||
|
|
||
| INSTALL_DIR="${SOLR_DIR}/${SOLR_VERSION}" | ||
| HOME_DIR="${INSTALL_DIR}/server/${SOLR_HOME}" | ||
| TEMPLATE_DIR="${HOME_DIR}/template" | ||
| START_SCRIPT="./${INSTALL_DIR}/bin/solr" | ||
| ZOOKEEPER_CLI_SCRIPT="./${INSTALL_DIR}/server/scripts/cloud-scripts/zkcli.sh" | ||
| ZOOKEEPER_HOST="" | ||
|
|
||
| SCRIPT_DIR=`dirname $0` | ||
| if [ "$1" = "--solr-cloud" ]; then | ||
| SOLR_CLOUD='yes' | ||
| fi | ||
|
|
||
| download() { | ||
| case ${SOLR_VERSION} in | ||
|
|
@@ -35,10 +55,10 @@ download() { | |
|
|
||
| create_dir ${SOLR_DIR} | ||
|
|
||
| local archive_file_name="${SOLR_VERSION}.tgz" | ||
| local installation_archive_file="${SOLR_DIR}/${archive_file_name}" | ||
|
|
||
| if [ ! -d ${INSTALL_DIR} ] ; then | ||
| echo "Installation ${SOLR_VERSION} does not exists" | ||
|
|
||
| if [ ! -f ${installation_archive_file} ] ; then | ||
|
|
@@ -49,30 +69,30 @@ download() { | |
| fi | ||
|
|
||
| echo "Extracting from installation archive ${archive_file_name}..." | ||
| create_dir ${INSTALL_DIR} | ||
| tar -zxf ${installation_archive_file} -C ${INSTALL_DIR} --strip-components=1 | ||
| echo 'Extracted' | ||
| else | ||
| echo "Found existing ${SOLR_VERSION} installation" | ||
| fi | ||
| } | ||
|
|
||
| copy_files() { | ||
| local destination_dir_name=$1 | ||
| shift | ||
| local files="$@" | ||
|
|
||
| for file in ${files} ; do | ||
| copy_file ${file} ${destination_dir_name} | ||
| done | ||
| } | ||
|
|
||
| copy_file() { | ||
| local file=$1 | ||
| local destination_dir=$2 | ||
|
|
||
| if [ -f ${file} ] ; then | ||
| cp ${file} ${destination_dir} || exit_on_error "Couldn't copy file '${file}' to directory '${destination_dir}'" | ||
| echo "Copied file '${file}' to directory '${destination_dir}'" | ||
| else | ||
| echo "${file} is not valid" | ||
|
|
@@ -81,71 +101,194 @@ copy_file() { | |
| } | ||
|
|
||
| create_dir() { | ||
| local dir_name=$1 | ||
|
|
||
| if [ ! -d ${dir_name} ] ; then | ||
| mkdir ${dir_name} || exit_on_error "Couldn't create directory '${dir_name}'" | ||
| echo "Created directory '${dir_name}'" | ||
| fi | ||
| } | ||
|
|
||
| exit_on_error() { | ||
| local message=$1 | ||
|
|
||
| echo "ERROR: ${message}" | ||
| exit 1 | ||
| } | ||
|
|
||
| #reintroduced VL | ||
| is_solr_up() { | ||
| local address="http://localhost:${SOLR_PORT}/solr/admin/cores" | ||
| local http_code=`echo $(curl -s -o /dev/null -w "%{http_code}" ${address})` | ||
| echo "Checking if Solr is up on ${address}" | ||
| return `test ${http_code} = "200"` | ||
| } | ||
|
|
||
| #reintroduced VL | ||
| wait_for_solr(){ | ||
| while ! is_solr_up; do | ||
| sleep 3 | ||
| done | ||
| } | ||
|
|
||
| # Run for Solr 6 | ||
| solr_run() { | ||
| echo "Running with version ${SOLR_VERSION} in standalone mode" | ||
| echo "Starting solr on port ${SOLR_PORT}..." | ||
|
|
||
| ./${SOLR_INSTALL_DIR}/bin/solr -p ${SOLR_PORT} -s ${SOLR_HOME} || exit_on_error "Can't start Solr" | ||
|
|
||
| echo "Started" | ||
|
|
||
| solr_create_cores | ||
| } | ||
|
|
||
| # Create cores for Solr 6 | ||
| solr_create_cores() { | ||
| home_dir="${SOLR_INSTALL_DIR}/server/${SOLR_HOME}" | ||
| template_dir="${home_dir}/template" | ||
|
|
||
| for solr_core in ${SOLR_CORES} ; do | ||
| if [ ! -d "${home_dir}/${solr_core}" ] ; then | ||
| solr_create_core ${solr_core} ${template_dir} | ||
| else | ||
| echo "Core ${solr_core} already exists, skipping" | ||
| fi | ||
| done | ||
| } | ||
|
|
||
| solr_create_core() { | ||
| core_name=$1 | ||
| config_dir=$2 | ||
|
|
||
| ./${SOLR_INSTALL_DIR}/bin/solr create_core -c ${core_name} -d ${config_dir} || exit_on_error "Can't create core" | ||
| } | ||
|
|
||
| solr_cloud_configure_nodes() { | ||
| create_dir ${HOME_DIR} | ||
|
|
||
| for node in "${SOLR_NODES[@]}" ; do | ||
| IFS=':' read node_name node_port <<< "${node}" | ||
|
|
||
| if [ ! -d "${HOME_DIR}/${node_name}" ] ; then | ||
| solr_cloud_configure_node ${node_name} ${node_port} | ||
| else | ||
| echo "Node '${node_name}' already exists, skipping" | ||
| fi | ||
| done | ||
| } | ||
|
|
||
| solr_cloud_configure_node() { | ||
| local name=$1 | ||
| local port=$2 | ||
| local node_dir="${HOME_DIR}/${name}" | ||
|
|
||
| create_dir ${node_dir} | ||
| copy_file "${INSTALL_DIR}/server/solr/zoo.cfg" ${node_dir} | ||
| copy_file "${INSTALL_DIR}/server/solr/solr.xml" ${node_dir} | ||
|
|
||
| # define host name 'localhost' | ||
| sed -i.bak "s/\${host:}/\${host:localhost}/g" "${node_dir}/solr.xml" || exit_on_error "Can't modify file '${node_dir}/solr.xml'" | ||
| # define port | ||
| sed -i.bak "s/\${jetty.port:8983}/\${jetty.port:${port}}/g" "${node_dir}/solr.xml" || exit_on_error "Can't modify file '${node_dir}/solr.xml'" | ||
| } | ||
|
|
||
| solr_cloud_start_nodes() { | ||
| for node in "${SOLR_NODES[@]}" ; do | ||
| local IFS=':'; read node_name node_port <<< "${node}" | ||
| local node_dir="${HOME_DIR}/${node_name}" | ||
|
|
||
| if [[ ! ${ZOOKEEPER_HOST} ]] ; then | ||
| ${START_SCRIPT} start -cloud -s ${node_dir} -p ${node_port} -V || exit_on_error "Can't start node '${node_name}'" | ||
| # start script default | ||
| ZOOKEEPER_HOST="localhost:$((node_port+1000))" | ||
| else | ||
| ${START_SCRIPT} start -cloud -s ${node_dir} -p ${node_port} -z "${ZOOKEEPER_HOST}" -V || exit_on_error "Can't start node '${node_name}'" | ||
| fi | ||
| done | ||
| } | ||
|
|
||
| solr_cloud_configure_collection() { | ||
| if [ -d ${TEMPLATE_DIR} ] ; then | ||
| echo "Configuration template is already created, skipping..." | ||
| return 1 | ||
| fi | ||
|
|
||
| create_dir ${HOME_DIR} | ||
| create_dir ${TEMPLATE_DIR} | ||
|
|
||
| local files=("${SOLR_CONFIG[@]}") | ||
| local config_dir="${INSTALL_DIR}/server/solr/configsets/basic_configs/conf" | ||
|
|
||
| files+=("${config_dir}/currency.xml") | ||
| files+=("${config_dir}/stopwords.txt") | ||
| files+=("${config_dir}/synonyms.txt") | ||
| files+=("${config_dir}/elevate.xml") | ||
| files+=("${config_dir}/solrconfig.xml") | ||
|
|
||
| copy_files ${TEMPLATE_DIR} "${files[*]}" | ||
|
|
||
| # modify solrconfig.xml to remove section that doesn't agree with our schema | ||
| sed -i.bak '/<updateRequestProcessorChain name="add-unknown-fields-to-the-schema">/,/<\/updateRequestProcessorChain>/d' "${TEMPLATE_DIR}/solrconfig.xml" || exit_on_error "Can't modify file '${TEMPLATE_DIR}/solrconfig.xml'" | ||
| # Adapt autoSoftCommit to have a recommended value | ||
| sed -i.bak2 's/${solr.autoSoftCommit.maxTime:-1}/${solr.autoSoftCommit.maxTime:20}/' "${TEMPLATE_DIR}/solrconfig.xml" || exit_on_error "Can't modify file '${TEMPLATE_DIR}/solrconfig.xml'" | ||
| } | ||
|
|
||
| solr_cloud_upload_collection_configuration() { | ||
| ${ZOOKEEPER_CLI_SCRIPT} -zkhost "${ZOOKEEPER_HOST}" -cmd upconfig -confname ${SOLR_CONFIGURATION_NAME} -confdir ${TEMPLATE_DIR} || exit_on_error "Can't upload configuration to Zookeeper" | ||
| echo "Uploaded configuration to Zookeeper" | ||
| } | ||
|
|
||
| solr_cloud_create_collections() { | ||
| for solr_core in ${SOLR_CORES} ; do | ||
| solr_cloud_create_collection "${solr_core}" | ||
| done | ||
| } | ||
|
|
||
| solr_cloud_create_collection() { | ||
| local collection_name=$1 | ||
| local shards_array=($SOLR_SHARDS) | ||
| local shards_count="${#shards_array[@]}" | ||
| local shards="${SOLR_SHARDS[@]// /,}" | ||
| local nodes_tmp=("${SOLR_NODES[@]/*:/localhost:}") | ||
| local nodes="${nodes_tmp[@]/%/_solr}" | ||
| nodes="${nodes[@]// /,}" | ||
|
|
||
| local parameters=( | ||
| "name=${collection_name}" | ||
| "collection.configName=${SOLR_CONFIGURATION_NAME}" | ||
| "createNodeSet=${nodes}" | ||
| "shards=${shards}" | ||
| "maxShardsPerNode=${SOLR_MAX_SHARDS_PER_NODE}" | ||
| "replicationFactor=${SOLR_REPLICATION_FACTOR}" | ||
| "router.name=compositeId" | ||
| "numShards=${shards_count}" | ||
| "createNodeSet.shuffle=false" | ||
| "wt=json" | ||
| "indent=on" | ||
| ) | ||
|
|
||
| echo "Creating collection with parameters:" | ||
| echo "$(IFS=$'\n'; echo "${parameters[*]}")" | ||
|
|
||
| local url="http://localhost:8983/solr/admin/collections?action=CREATE&$(IFS=$'&'; echo "${parameters[*]}")" | ||
|
|
||
| curl ${url} || exit_on_error "Couldn't create collection" | ||
| } | ||
|
|
||
| download | ||
|
|
||
| if [ "$SOLR_CLOUD" = "no" ]; then | ||
| $SCRIPT_DIR/../generate-solr-config.sh \ | ||
|
There was a problem hiding this comment. @adamwojs This script is used to generate config for platform.sh, which is kind of a must. So most likely many of the changes here should be moved into @vidarl might be able to provide more info, and also who to talk to there if needed. There was a problem hiding this comment. You might be right, but let's process with combination platform.sh + Solr Cloud as follow up for this PR. I want to unblock QA on this PR and platform.sh itself is a quite new topic for me 😉 |
||
| --solr-install-dir="${SOLR_INSTALL_DIR}" \ | ||
| --destination-dir="${SOLR_INSTALL_DIR}/server/${SOLR_HOME}/template" | ||
| solr_run | ||
| else | ||
| solr_cloud_configure_nodes | ||
| solr_cloud_start_nodes | ||
| solr_cloud_configure_collection | ||
| solr_cloud_upload_collection_configuration | ||
| solr_cloud_create_collections | ||
| fi | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you have to add this line (https://github.com/ezsystems/ezplatform-solr-search-engine/blob/master/bin/generate-solr-config.sh#L123) here as well even though tests are passing. Without it, you'll notice a significant delay before seeing content changes (eg. breadcrumbs in AdminUI).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Applied in 260c729