You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Uwe Schindler <uw...@thetaphi.de> on 2019/04/22 10:29:42 UTC
Re: [lucene-solr] branch branch_7x updated: SOLR-13392: Add all solr dependencies to prometheus exporter classpath to make sure that it can start.
Didn't we have a limitation added so one can't push to 7.x?
Adrien how was the status there?
Uwe
Am April 22, 2019 6:50:58 AM UTC schrieb shalin@apache.org:
>This is an automated email from the ASF dual-hosted git repository.
>
>shalin pushed a commit to branch branch_7x
>in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
>
>
>The following commit(s) were added to refs/heads/branch_7x by this
>push:
>new a5f75c6 SOLR-13392: Add all solr dependencies to prometheus
>exporter classpath to make sure that it can start.
>a5f75c6 is described below
>
>commit a5f75c62c33738bfbbabb439ebbfc1b143b0c4b9
>Author: Shalin Shekhar Mangar <sh...@apache.org>
>AuthorDate: Mon Apr 22 12:18:56 2019 +0530
>
>SOLR-13392: Add all solr dependencies to prometheus exporter classpath
>to make sure that it can start.
>
>SOLR-13234 broke prometheus exporter startup from the startup scripts
>because there was a mismatch between the dependency list in ant/ivy and
>those actually added to the classpath by the script. This commit
>changes the script to add all solr dependencies to the classpath.
>
> (cherry picked from commit 4571a2d66687cca6670885a94414c7a8c02c0bbc)
>---
> solr/contrib/prometheus-exporter/bin/solr-exporter | 4 +
>.../prometheus-exporter/bin/solr-exporter.cmd | 208
>++++++++++-----------
> 2 files changed, 108 insertions(+), 104 deletions(-)
>
>diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter
>b/solr/contrib/prometheus-exporter/bin/solr-exporter
>index 834e83e..ea34960 100755
>--- a/solr/contrib/prometheus-exporter/bin/solr-exporter
>+++ b/solr/contrib/prometheus-exporter/bin/solr-exporter
>@@ -99,6 +99,10 @@ for JAR in $(find "$BASEDIR"/lucene-libs -name
>'*.jar')
> do
> CLASSPATH="$CLASSPATH":"$JAR"
> done
>+for JAR in $(find
>"$BASEDIR"/../../server/solr-webapp/webapp/WEB-INF/lib -name '*.jar')
>+do
>+ CLASSPATH="$CLASSPATH":"$JAR"
>+done
>
>EXTRA_JVM_ARGUMENTS="-Xmx512m
>-Dlog4j.configurationFile=file:"$BASEDIR"/../../server/resources/log4j2-console.xml"
>
>diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>index f51cfa8..4ff47cf 100644
>--- a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>+++ b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>@@ -1,104 +1,104 @@
>-@REM
>-@REM Licensed to the Apache Software Foundation (ASF) under one or
>more
>-@REM contributor license agreements. See the NOTICE file distributed
>with
>-@REM this work for additional information regarding copyright
>ownership.
>-@REM The ASF licenses this file to You under the Apache License,
>Version 2.0
>-@REM (the "License"); you may not use this file except in compliance
>with
>-@REM the License. You may obtain a copy of the License at
>-@REM
>-@REM http://www.apache.org/licenses/LICENSE-2.0
>-@REM
>-@REM Unless required by applicable law or agreed to in writing,
>software
>-@REM distributed under the License is distributed on an "AS IS"
>BASIS,
>-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>implied.
>-@REM See the License for the specific language governing permissions
>and
>-@REM limitations under the License.
>-
>-@echo off
>-
>-set ERROR_CODE=0
>-
>-:init
>-@REM Decide how to startup depending on the version of windows
>-
>-@REM -- Win98ME
>-if NOT "%OS%"=="Windows_NT" goto Win9xArg
>-
>-@REM set local scope for the variables with windows NT shell
>-if "%OS%"=="Windows_NT" @setlocal
>-
>-@REM -- 4NT shell
>-if "%eval[2+2]" == "4" goto 4NTArgs
>-
>-@REM -- Regular WinNT shell
>-set CMD_LINE_ARGS=%*
>-goto WinNTGetScriptDir
>-
>-@REM The 4NT Shell from jp software
>-:4NTArgs
>-set CMD_LINE_ARGS=%$
>-goto WinNTGetScriptDir
>-
>-:Win9xArg
>-@REM Slurp the command line arguments. This loop allows for an
>unlimited number
>-@REM of agruments (up to the command line limit, anyway).
>-set CMD_LINE_ARGS=
>-:Win9xApp
>-if %1a==a goto Win9xGetScriptDir
>-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>-shift
>-goto Win9xApp
>-
>-:Win9xGetScriptDir
>-set SAVEDIR=%CD%
>-%0\
>-cd %0\..\..
>-set BASEDIR=%CD%
>-cd %SAVEDIR%
>-set SAVE_DIR=
>-goto repoSetup
>-
>-:WinNTGetScriptDir
>-set BASEDIR=%~dp0..
>-
>-:repoSetup
>-
>-
>-if "%JAVACMD%"=="" set JAVACMD=java
>-
>-if "%REPO%"=="" set REPO=%BASEDIR%\lib
>-
>-set
>CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*
>-set EXTRA_JVM_ARGUMENTS=-Xmx512m
>-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>-goto endInit
>-
>-@REM Reaching here means variables are defined and arguments have been
>captured
>-:endInit
>-
>-%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath
>"%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter"
>-Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%"
>org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>-if ERRORLEVEL 1 goto error
>-goto end
>-
>-:error
>-if "%OS%"=="Windows_NT" @endlocal
>-set ERROR_CODE=1
>-
>-:end
>-@REM set local scope for the variables with windows NT shell
>-if "%OS%"=="Windows_NT" goto endNT
>-
>-@REM For old DOS remove the set variables from ENV - we assume they
>were not set
>-@REM before we started - at least we don't leave any baggage around
>-set CMD_LINE_ARGS=
>-goto postExec
>-
>-:endNT
>-@endlocal
>-
>-:postExec
>-
>-if "%FORCE_EXIT_ON_ERROR%" == "on" (
>- if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>-)
>-
>-exit /B %ERROR_CODE%
>+@REM
>+@REM Licensed to the Apache Software Foundation (ASF) under one or
>more
>+@REM contributor license agreements. See the NOTICE file distributed
>with
>+@REM this work for additional information regarding copyright
>ownership.
>+@REM The ASF licenses this file to You under the Apache License,
>Version 2.0
>+@REM (the "License"); you may not use this file except in compliance
>with
>+@REM the License. You may obtain a copy of the License at
>+@REM
>+@REM http://www.apache.org/licenses/LICENSE-2.0
>+@REM
>+@REM Unless required by applicable law or agreed to in writing,
>software
>+@REM distributed under the License is distributed on an "AS IS"
>BASIS,
>+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>implied.
>+@REM See the License for the specific language governing permissions
>and
>+@REM limitations under the License.
>+
>+@echo off
>+
>+set ERROR_CODE=0
>+
>+:init
>+@REM Decide how to startup depending on the version of windows
>+
>+@REM -- Win98ME
>+if NOT "%OS%"=="Windows_NT" goto Win9xArg
>+
>+@REM set local scope for the variables with windows NT shell
>+if "%OS%"=="Windows_NT" @setlocal
>+
>+@REM -- 4NT shell
>+if "%eval[2+2]" == "4" goto 4NTArgs
>+
>+@REM -- Regular WinNT shell
>+set CMD_LINE_ARGS=%*
>+goto WinNTGetScriptDir
>+
>+@REM The 4NT Shell from jp software
>+:4NTArgs
>+set CMD_LINE_ARGS=%$
>+goto WinNTGetScriptDir
>+
>+:Win9xArg
>+@REM Slurp the command line arguments. This loop allows for an
>unlimited number
>+@REM of agruments (up to the command line limit, anyway).
>+set CMD_LINE_ARGS=
>+:Win9xApp
>+if %1a==a goto Win9xGetScriptDir
>+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>+shift
>+goto Win9xApp
>+
>+:Win9xGetScriptDir
>+set SAVEDIR=%CD%
>+%0\
>+cd %0\..\..
>+set BASEDIR=%CD%
>+cd %SAVEDIR%
>+set SAVE_DIR=
>+goto repoSetup
>+
>+:WinNTGetScriptDir
>+set BASEDIR=%~dp0..
>+
>+:repoSetup
>+
>+
>+if "%JAVACMD%"=="" set JAVACMD=java
>+
>+if "%REPO%"=="" set REPO=%BASEDIR%\lib
>+
>+set
>CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*;%BASEDIR%\..\..\server\solr-webapp\webapp\WEB-INF\lib\*
>+set EXTRA_JVM_ARGUMENTS=-Xmx512m
>-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>+goto endInit
>+
>+@REM Reaching here means variables are defined and arguments have been
>captured
>+:endInit
>+
>+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath
>"%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter"
>-Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%"
>org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>+if ERRORLEVEL 1 goto error
>+goto end
>+
>+:error
>+if "%OS%"=="Windows_NT" @endlocal
>+set ERROR_CODE=1
>+
>+:end
>+@REM set local scope for the variables with windows NT shell
>+if "%OS%"=="Windows_NT" goto endNT
>+
>+@REM For old DOS remove the set variables from ENV - we assume they
>were not set
>+@REM before we started - at least we don't leave any baggage around
>+set CMD_LINE_ARGS=
>+goto postExec
>+
>+:endNT
>+@endlocal
>+
>+:postExec
>+
>+if "%FORCE_EXIT_ON_ERROR%" == "on" (
>+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>+)
>+
>+exit /B %ERROR_CODE%
--
Uwe Schindler
Achterdiek 19, 28357 Bremen
https://www.thetaphi.de
Re: [lucene-solr] branch branch_7x updated: SOLR-13392: Add all solr dependencies to prometheus exporter classpath to make sure that it can start.
Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi,
The question was more why the restrictions did not apply for you.
Uwe
Am April 22, 2019 10:43:48 AM UTC schrieb Shalin Shekhar Mangar <sh...@apache.org>:
>Sorry, I just searched the archives and saw the discussion about
>disallowing commits to 7x. I'll take care in future.
>
>On Mon, Apr 22, 2019 at 3:59 PM Uwe Schindler <uw...@thetaphi.de> wrote:
>
>> Didn't we have a limitation added so one can't push to 7.x?
>>
>> Adrien how was the status there?
>>
>> Uwe
>>
>> Am April 22, 2019 6:50:58 AM UTC schrieb shalin@apache.org:
>>>
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> shalin pushed a commit to branch branch_7x
>>> in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/branch_7x by this
>push:
>>> new a5f75c6 SOLR-13392: Add all solr dependencies to
>prometheus exporter classpath to make sure that it can start.
>>> a5f75c6 is described below
>>>
>>> commit a5f75c62c33738bfbbabb439ebbfc1b143b0c4b9
>>> Author: Shalin Shekhar Mangar <sh...@apache.org>
>>> AuthorDate: Mon Apr 22 12:18:56 2019 +0530
>>>
>>> SOLR-13392: Add all solr dependencies to prometheus exporter
>classpath to make sure that it can start.
>>>
>>> SOLR-13234 broke prometheus exporter startup from the startup
>scripts because there was a mismatch between the dependency list in
>ant/ivy and those actually added to the classpath by the script. This
>commit changes the script to add all solr dependencies to the
>classpath.
>>>
>>> (cherry picked from commit
>4571a2d66687cca6670885a94414c7a8c02c0bbc)
>>> ------------------------------
>>> solr/contrib/prometheus-exporter/bin/solr-exporter | 4 +
>>> .../prometheus-exporter/bin/solr-exporter.cmd | 208
>++++++++++-----------
>>> 2 files changed, 108 insertions(+), 104 deletions(-)
>>>
>>> diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter
>b/solr/contrib/prometheus-exporter/bin/solr-exporter
>>> index 834e83e..ea34960 100755
>>> --- a/solr/contrib/prometheus-exporter/bin/solr-exporter
>>> +++ b/solr/contrib/prometheus-exporter/bin/solr-exporter
>>> @@ -99,6 +99,10 @@ for JAR in $(find "$BASEDIR"/lucene-libs -name
>'*.jar')
>>> do
>>> CLASSPATH="$CLASSPATH":"$JAR"
>>> done
>>> +for JAR in $(find
>"$BASEDIR"/../../server/solr-webapp/webapp/WEB-INF/lib -name '*.jar')
>>> +do
>>> + CLASSPATH="$CLASSPATH":"$JAR"
>>> +done
>>>
>>> EXTRA_JVM_ARGUMENTS="-Xmx512m
>-Dlog4j.configurationFile=file:"$BASEDIR"/../../server/resources/log4j2-console.xml"
>>>
>>> diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>>> index f51cfa8..4ff47cf 100644
>>> --- a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>>> +++ b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>>> @@ -1,104 +1,104 @@
>>> -@REM
>>> -@REM Licensed to the Apache Software Foundation (ASF) under one or
>more
>>> -@REM contributor license agreements. See the NOTICE file
>distributed with
>>> -@REM this work for additional information regarding copyright
>ownership.
>>> -@REM The ASF licenses this file to You under the Apache License,
>Version 2.0
>>> -@REM (the "License"); you may not use this file except in
>compliance with
>>> -@REM the License. You may obtain a copy of the License at
>>> -@REM
>>> -@REM http://www.apache.org/licenses/LICENSE-2.0
>>> -@REM
>>> -@REM Unless required by applicable law or agreed to in writing,
>software
>>> -@REM distributed under the License is distributed on an "AS IS"
>BASIS,
>>> -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
>or implied.
>>> -@REM See the License for the specific language governing
>permissions and
>>> -@REM limitations under the License.
>>> -
>>> -@echo off
>>> -
>>> -set ERROR_CODE=0
>>> -
>>> -:init
>>> -@REM Decide how to startup depending on the version of windows
>>> -
>>> -@REM -- Win98ME
>>> -if NOT "%OS%"=="Windows_NT" goto Win9xArg
>>> -
>>> -@REM set local scope for the variables with windows NT shell
>>> -if "%OS%"=="Windows_NT" @setlocal
>>> -
>>> -@REM -- 4NT shell
>>> -if "%eval[2+2]" == "4" goto 4NTArgs
>>> -
>>> -@REM -- Regular WinNT shell
>>> -set CMD_LINE_ARGS=%*
>>> -goto WinNTGetScriptDir
>>> -
>>> -@REM The 4NT Shell from jp software
>>> -:4NTArgs
>>> -set CMD_LINE_ARGS=%$
>>> -goto WinNTGetScriptDir
>>> -
>>> -:Win9xArg
>>> -@REM Slurp the command line arguments. This loop allows for an
>unlimited number
>>> -@REM of agruments (up to the command line limit, anyway).
>>> -set CMD_LINE_ARGS=
>>> -:Win9xApp
>>> -if %1a==a goto Win9xGetScriptDir
>>> -set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>>> -shift
>>> -goto Win9xApp
>>> -
>>> -:Win9xGetScriptDir
>>> -set SAVEDIR=%CD%
>>> -%0\
>>> -cd %0\..\..
>>> -set BASEDIR=%CD%
>>> -cd %SAVEDIR%
>>> -set SAVE_DIR=
>>> -goto repoSetup
>>> -
>>> -:WinNTGetScriptDir
>>> -set BASEDIR=%~dp0..
>>> -
>>> -:repoSetup
>>> -
>>> -
>>> -if "%JAVACMD%"=="" set JAVACMD=java
>>> -
>>> -if "%REPO%"=="" set REPO=%BASEDIR%\lib
>>> -
>>> -set
>CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*
>>> -set EXTRA_JVM_ARGUMENTS=-Xmx512m
>-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>>> -goto endInit
>>> -
>>> -@REM Reaching here means variables are defined and arguments have
>been captured
>>> -:endInit
>>> -
>>> -%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath
>"%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter"
>-Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%"
>org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>>> -if ERRORLEVEL 1 goto error
>>> -goto end
>>> -
>>> -:error
>>> -if "%OS%"=="Windows_NT" @endlocal
>>> -set ERROR_CODE=1
>>> -
>>> -:end
>>> -@REM set local scope for the variables with windows NT shell
>>> -if "%OS%"=="Windows_NT" goto endNT
>>> -
>>> -@REM For old DOS remove the set variables from ENV - we assume they
>were not set
>>> -@REM before we started - at least we don't leave any baggage around
>>> -set CMD_LINE_ARGS=
>>> -goto postExec
>>> -
>>> -:endNT
>>> -@endlocal
>>> -
>>> -:postExec
>>> -
>>> -if "%FORCE_EXIT_ON_ERROR%" == "on" (
>>> - if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>>> -)
>>> -
>>> -exit /B %ERROR_CODE%
>>> +@REM
>>> +@REM Licensed to the Apache Software Foundation (ASF) under one or
>more
>>> +@REM contributor license agreements. See the NOTICE file
>distributed with
>>> +@REM this work for additional information regarding copyright
>ownership.
>>> +@REM The ASF licenses this file to You under the Apache License,
>Version 2.0
>>> +@REM (the "License"); you may not use this file except in
>compliance with
>>> +@REM the License. You may obtain a copy of the License at
>>> +@REM
>>> +@REM http://www.apache.org/licenses/LICENSE-2.0
>>> +@REM
>>> +@REM Unless required by applicable law or agreed to in writing,
>software
>>> +@REM distributed under the License is distributed on an "AS IS"
>BASIS,
>>> +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
>or implied.
>>> +@REM See the License for the specific language governing
>permissions and
>>> +@REM limitations under the License.
>>> +
>>> +@echo off
>>> +
>>> +set ERROR_CODE=0
>>> +
>>> +:init
>>> +@REM Decide how to startup depending on the version of windows
>>> +
>>> +@REM -- Win98ME
>>> +if NOT "%OS%"=="Windows_NT" goto Win9xArg
>>> +
>>> +@REM set local scope for the variables with windows NT shell
>>> +if "%OS%"=="Windows_NT" @setlocal
>>> +
>>> +@REM -- 4NT shell
>>> +if "%eval[2+2]" == "4" goto 4NTArgs
>>> +
>>> +@REM -- Regular WinNT shell
>>> +set CMD_LINE_ARGS=%*
>>> +goto WinNTGetScriptDir
>>> +
>>> +@REM The 4NT Shell from jp software
>>> +:4NTArgs
>>> +set CMD_LINE_ARGS=%$
>>> +goto WinNTGetScriptDir
>>> +
>>> +:Win9xArg
>>> +@REM Slurp the command line arguments. This loop allows for an
>unlimited number
>>> +@REM of agruments (up to the command line limit, anyway).
>>> +set CMD_LINE_ARGS=
>>> +:Win9xApp
>>> +if %1a==a goto Win9xGetScriptDir
>>> +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>>> +shift
>>> +goto Win9xApp
>>> +
>>> +:Win9xGetScriptDir
>>> +set SAVEDIR=%CD%
>>> +%0\
>>> +cd %0\..\..
>>> +set BASEDIR=%CD%
>>> +cd %SAVEDIR%
>>> +set SAVE_DIR=
>>> +goto repoSetup
>>> +
>>> +:WinNTGetScriptDir
>>> +set BASEDIR=%~dp0..
>>> +
>>> +:repoSetup
>>> +
>>> +
>>> +if "%JAVACMD%"=="" set JAVACMD=java
>>> +
>>> +if "%REPO%"=="" set REPO=%BASEDIR%\lib
>>> +
>>> +set
>CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*;%BASEDIR%\..\..\server\solr-webapp\webapp\WEB-INF\lib\*
>>> +set EXTRA_JVM_ARGUMENTS=-Xmx512m
>-Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>>> +goto endInit
>>> +
>>> +@REM Reaching here means variables are defined and arguments have
>been captured
>>> +:endInit
>>> +
>>> +%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath
>"%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter"
>-Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%"
>org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>>> +if ERRORLEVEL 1 goto error
>>> +goto end
>>> +
>>> +:error
>>> +if "%OS%"=="Windows_NT" @endlocal
>>> +set ERROR_CODE=1
>>> +
>>> +:end
>>> +@REM set local scope for the variables with windows NT shell
>>> +if "%OS%"=="Windows_NT" goto endNT
>>> +
>>> +@REM For old DOS remove the set variables from ENV - we assume they
>were not set
>>> +@REM before we started - at least we don't leave any baggage around
>>> +set CMD_LINE_ARGS=
>>> +goto postExec
>>> +
>>> +:endNT
>>> +@endlocal
>>> +
>>> +:postExec
>>> +
>>> +if "%FORCE_EXIT_ON_ERROR%" == "on" (
>>> + if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>>> +)
>>> +
>>> +exit /B %ERROR_CODE%
>>>
>>>
>> --
>> Uwe Schindler
>> Achterdiek 19, 28357 Bremen
>> https://www.thetaphi.de
>>
>
>
>--
>Regards,
>Shalin Shekhar Mangar.
--
Uwe Schindler
Achterdiek 19, 28357 Bremen
https://www.thetaphi.de
Re: [lucene-solr] branch branch_7x updated: SOLR-13392: Add all solr
dependencies to prometheus exporter classpath to make sure that it can start.
Posted by Shalin Shekhar Mangar <sh...@apache.org>.
Sorry, I just searched the archives and saw the discussion about
disallowing commits to 7x. I'll take care in future.
On Mon, Apr 22, 2019 at 3:59 PM Uwe Schindler <uw...@thetaphi.de> wrote:
> Didn't we have a limitation added so one can't push to 7.x?
>
> Adrien how was the status there?
>
> Uwe
>
> Am April 22, 2019 6:50:58 AM UTC schrieb shalin@apache.org:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> shalin pushed a commit to branch branch_7x
>> in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
>>
>>
>> The following commit(s) were added to refs/heads/branch_7x by this push:
>> new a5f75c6 SOLR-13392: Add all solr dependencies to prometheus exporter classpath to make sure that it can start.
>> a5f75c6 is described below
>>
>> commit a5f75c62c33738bfbbabb439ebbfc1b143b0c4b9
>> Author: Shalin Shekhar Mangar <sh...@apache.org>
>> AuthorDate: Mon Apr 22 12:18:56 2019 +0530
>>
>> SOLR-13392: Add all solr dependencies to prometheus exporter classpath to make sure that it can start.
>>
>> SOLR-13234 broke prometheus exporter startup from the startup scripts because there was a mismatch between the dependency list in ant/ivy and those actually added to the classpath by the script. This commit changes the script to add all solr dependencies to the classpath.
>>
>> (cherry picked from commit 4571a2d66687cca6670885a94414c7a8c02c0bbc)
>> ------------------------------
>> solr/contrib/prometheus-exporter/bin/solr-exporter | 4 +
>> .../prometheus-exporter/bin/solr-exporter.cmd | 208 ++++++++++-----------
>> 2 files changed, 108 insertions(+), 104 deletions(-)
>>
>> diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter b/solr/contrib/prometheus-exporter/bin/solr-exporter
>> index 834e83e..ea34960 100755
>> --- a/solr/contrib/prometheus-exporter/bin/solr-exporter
>> +++ b/solr/contrib/prometheus-exporter/bin/solr-exporter
>> @@ -99,6 +99,10 @@ for JAR in $(find "$BASEDIR"/lucene-libs -name '*.jar')
>> do
>> CLASSPATH="$CLASSPATH":"$JAR"
>> done
>> +for JAR in $(find "$BASEDIR"/../../server/solr-webapp/webapp/WEB-INF/lib -name '*.jar')
>> +do
>> + CLASSPATH="$CLASSPATH":"$JAR"
>> +done
>>
>> EXTRA_JVM_ARGUMENTS="-Xmx512m -Dlog4j.configurationFile=file:"$BASEDIR"/../../server/resources/log4j2-console.xml"
>>
>> diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>> index f51cfa8..4ff47cf 100644
>> --- a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>> +++ b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
>> @@ -1,104 +1,104 @@
>> -@REM
>> -@REM Licensed to the Apache Software Foundation (ASF) under one or more
>> -@REM contributor license agreements. See the NOTICE file distributed with
>> -@REM this work for additional information regarding copyright ownership.
>> -@REM The ASF licenses this file to You under the Apache License, Version 2.0
>> -@REM (the "License"); you may not use this file except in compliance with
>> -@REM the License. You may obtain a copy of the License at
>> -@REM
>> -@REM http://www.apache.org/licenses/LICENSE-2.0
>> -@REM
>> -@REM Unless required by applicable law or agreed to in writing, software
>> -@REM distributed under the License is distributed on an "AS IS" BASIS,
>> -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>> -@REM See the License for the specific language governing permissions and
>> -@REM limitations under the License.
>> -
>> -@echo off
>> -
>> -set ERROR_CODE=0
>> -
>> -:init
>> -@REM Decide how to startup depending on the version of windows
>> -
>> -@REM -- Win98ME
>> -if NOT "%OS%"=="Windows_NT" goto Win9xArg
>> -
>> -@REM set local scope for the variables with windows NT shell
>> -if "%OS%"=="Windows_NT" @setlocal
>> -
>> -@REM -- 4NT shell
>> -if "%eval[2+2]" == "4" goto 4NTArgs
>> -
>> -@REM -- Regular WinNT shell
>> -set CMD_LINE_ARGS=%*
>> -goto WinNTGetScriptDir
>> -
>> -@REM The 4NT Shell from jp software
>> -:4NTArgs
>> -set CMD_LINE_ARGS=%$
>> -goto WinNTGetScriptDir
>> -
>> -:Win9xArg
>> -@REM Slurp the command line arguments. This loop allows for an unlimited number
>> -@REM of agruments (up to the command line limit, anyway).
>> -set CMD_LINE_ARGS=
>> -:Win9xApp
>> -if %1a==a goto Win9xGetScriptDir
>> -set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>> -shift
>> -goto Win9xApp
>> -
>> -:Win9xGetScriptDir
>> -set SAVEDIR=%CD%
>> -%0\
>> -cd %0\..\..
>> -set BASEDIR=%CD%
>> -cd %SAVEDIR%
>> -set SAVE_DIR=
>> -goto repoSetup
>> -
>> -:WinNTGetScriptDir
>> -set BASEDIR=%~dp0..
>> -
>> -:repoSetup
>> -
>> -
>> -if "%JAVACMD%"=="" set JAVACMD=java
>> -
>> -if "%REPO%"=="" set REPO=%BASEDIR%\lib
>> -
>> -set CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*
>> -set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>> -goto endInit
>> -
>> -@REM Reaching here means variables are defined and arguments have been captured
>> -:endInit
>> -
>> -%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath "%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter" -Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%" org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>> -if ERRORLEVEL 1 goto error
>> -goto end
>> -
>> -:error
>> -if "%OS%"=="Windows_NT" @endlocal
>> -set ERROR_CODE=1
>> -
>> -:end
>> -@REM set local scope for the variables with windows NT shell
>> -if "%OS%"=="Windows_NT" goto endNT
>> -
>> -@REM For old DOS remove the set variables from ENV - we assume they were not set
>> -@REM before we started - at least we don't leave any baggage around
>> -set CMD_LINE_ARGS=
>> -goto postExec
>> -
>> -:endNT
>> -@endlocal
>> -
>> -:postExec
>> -
>> -if "%FORCE_EXIT_ON_ERROR%" == "on" (
>> - if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>> -)
>> -
>> -exit /B %ERROR_CODE%
>> +@REM
>> +@REM Licensed to the Apache Software Foundation (ASF) under one or more
>> +@REM contributor license agreements. See the NOTICE file distributed with
>> +@REM this work for additional information regarding copyright ownership.
>> +@REM The ASF licenses this file to You under the Apache License, Version 2.0
>> +@REM (the "License"); you may not use this file except in compliance with
>> +@REM the License. You may obtain a copy of the License at
>> +@REM
>> +@REM http://www.apache.org/licenses/LICENSE-2.0
>> +@REM
>> +@REM Unless required by applicable law or agreed to in writing, software
>> +@REM distributed under the License is distributed on an "AS IS" BASIS,
>> +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
>> +@REM See the License for the specific language governing permissions and
>> +@REM limitations under the License.
>> +
>> +@echo off
>> +
>> +set ERROR_CODE=0
>> +
>> +:init
>> +@REM Decide how to startup depending on the version of windows
>> +
>> +@REM -- Win98ME
>> +if NOT "%OS%"=="Windows_NT" goto Win9xArg
>> +
>> +@REM set local scope for the variables with windows NT shell
>> +if "%OS%"=="Windows_NT" @setlocal
>> +
>> +@REM -- 4NT shell
>> +if "%eval[2+2]" == "4" goto 4NTArgs
>> +
>> +@REM -- Regular WinNT shell
>> +set CMD_LINE_ARGS=%*
>> +goto WinNTGetScriptDir
>> +
>> +@REM The 4NT Shell from jp software
>> +:4NTArgs
>> +set CMD_LINE_ARGS=%$
>> +goto WinNTGetScriptDir
>> +
>> +:Win9xArg
>> +@REM Slurp the command line arguments. This loop allows for an unlimited number
>> +@REM of agruments (up to the command line limit, anyway).
>> +set CMD_LINE_ARGS=
>> +:Win9xApp
>> +if %1a==a goto Win9xGetScriptDir
>> +set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
>> +shift
>> +goto Win9xApp
>> +
>> +:Win9xGetScriptDir
>> +set SAVEDIR=%CD%
>> +%0\
>> +cd %0\..\..
>> +set BASEDIR=%CD%
>> +cd %SAVEDIR%
>> +set SAVE_DIR=
>> +goto repoSetup
>> +
>> +:WinNTGetScriptDir
>> +set BASEDIR=%~dp0..
>> +
>> +:repoSetup
>> +
>> +
>> +if "%JAVACMD%"=="" set JAVACMD=java
>> +
>> +if "%REPO%"=="" set REPO=%BASEDIR%\lib
>> +
>> +set CLASSPATH=%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\*;%BASEDIR%\lucene-libs\*;%BASEDIR%\..\..\server\solr-webapp\webapp\WEB-INF\lib\*
>> +set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configurationFile=file:///%BASEDIR%\..\..\server\resources\log4j2-console.xml
>> +goto endInit
>> +
>> +@REM Reaching here means variables are defined and arguments have been captured
>> +:endInit
>> +
>> +%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath "%CLASSPATH_PREFIX%;%CLASSPATH%" -Dapp.name="solr-exporter" -Dapp.repo="%REPO%" -Dbasedir="%BASEDIR%" org.apache.solr.prometheus.exporter.SolrExporter %CMD_LINE_ARGS%
>> +if ERRORLEVEL 1 goto error
>> +goto end
>> +
>> +:error
>> +if "%OS%"=="Windows_NT" @endlocal
>> +set ERROR_CODE=1
>> +
>> +:end
>> +@REM set local scope for the variables with windows NT shell
>> +if "%OS%"=="Windows_NT" goto endNT
>> +
>> +@REM For old DOS remove the set variables from ENV - we assume they were not set
>> +@REM before we started - at least we don't leave any baggage around
>> +set CMD_LINE_ARGS=
>> +goto postExec
>> +
>> +:endNT
>> +@endlocal
>> +
>> +:postExec
>> +
>> +if "%FORCE_EXIT_ON_ERROR%" == "on" (
>> + if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
>> +)
>> +
>> +exit /B %ERROR_CODE%
>>
>>
> --
> Uwe Schindler
> Achterdiek 19, 28357 Bremen
> https://www.thetaphi.de
>
--
Regards,
Shalin Shekhar Mangar.