Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #29057 CWD to ES_HOME does not change drive #29086

Merged
merged 1 commit into from Mar 16, 2018

Conversation

Mpdreamz
Copy link
Member

The /d switch on cd also changes the current drive in DOS.
This allows the bat file to be called while the users CWD is on a different drive.

The /d switch on cd also changes the current drive in DOS.
This allows the bat file to be called while the users CWD is on a different drive.
@rjernst
Copy link
Member

rjernst commented Mar 15, 2018

LGTM. Please change the commit summary to something more meaningful, eg "Ensure changing dir to ES_HOME works across drives" and move the "fixes #29057" to the description.

@jasontedor jasontedor added the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label Mar 15, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@Mpdreamz
Copy link
Member Author

@rjernst mind changing the commit message when hitting squash & merge through github? I edited the file through github on my phone which created the branch under elastic not my fork and I rather not force push to elastic.

@jasontedor
Copy link
Member

That leaves open the possibility that this change is untested. Have you tested this change?

@Mpdreamz
Copy link
Member Author

Yes, I did in a VM which has two drives attached.

@jasontedor jasontedor merged commit 42c7c75 into master Mar 16, 2018
jasontedor pushed a commit that referenced this pull request Mar 16, 2018
The cd command on Windows has an oddity regarding changing
directories. If the drive of the current directory is a different drive
than than of the directory that was passed to the cd command, cd acts in
query mode and does not change the current directory. Instead, a flag is
needed to put the cd command into set mode so that the directory
actually changes. This causes a problem when starting Elasticsearch from
a directory different than the one where it is installed and this commit
fixes the issue.
@jasontedor jasontedor deleted the fix/cd-drive-bat-windows branch March 16, 2018 11:29
martijnvg added a commit that referenced this pull request Mar 16, 2018
* es/6.x: (89 commits)
  Clarify requirements of strict date formats. (#29090)
  Clarify that dates are always rendered as strings. (#29093)
  [Docs] Fix link to Grok patterns (#29088)
  Fix starting on Windows from another drive (#29086)
  Use removeTask instead of finishTask in PersistentTasksClusterService (#29055)
  Added minimal docs for reindex api in java-api docs
  Allow overriding JVM options in Windows service (#29044)
  Clarify how to set compiler and runtime JDKs (#29101)
  Fix Parsing Bug with Update By Query for Stored Scripts (#29039)
  TEST: write ops should execute under shard permit (#28966)
  [DOCS] Add X-Pack upgrade details (#29038)
  Revert "Improve error message for installing plugin (#28298)"
  Docs: HighLevelRestClient#exists (#29073)
  Validate regular expressions in dynamic templates. (#29013)
  [Tests] Fix GetResultTests and DocumentFieldTests failures (#29083)
  Reenable LiveVersionMapTests.testRamBytesUsed on Java 9. (#29063)
  Mute failing GetResultTests and DocumentFieldTests
  [Docs] Fix Java Api index administration usage (#28260)
  Improve error message for installing plugin (#28298)
  Decouple XContentBuilder from BytesReference (#28972)
  ...
martijnvg added a commit that referenced this pull request Mar 16, 2018
* es/master: (97 commits)
  Clarify requirements of strict date formats. (#29090)
  Clarify that dates are always rendered as strings. (#29093)
  Compilation fix for #29067
  [Docs] Fix link to Grok patterns (#29088)
  Store offsets in index prefix fields when stored in the parent field (#29067)
  Fix starting on Windows from another drive (#29086)
  Use removeTask instead of finishTask in PersistentTasksClusterService (#29055)
  Added minimal docs for reindex api in java-api docs
  Allow overriding JVM options in Windows service (#29044)
  Clarify how to set compiler and runtime JDKs (#29101)
  CLI: Close subcommands in MultiCommand (#28954)
  TEST: write ops should execute under shard permit (#28966)
  [DOCS] Add X-Pack upgrade details (#29038)
  Revert "Improve error message for installing plugin (#28298)"
  Docs: HighLevelRestClient#exists (#29073)
  Validate regular expressions in dynamic templates. (#29013)
  [Tests] Fix GetResultTests and DocumentFieldTests failures (#29083)
  Reenable LiveVersionMapTests.testRamBytesUsed on Java 9. (#29063)
  Mute failing GetResultTests and DocumentFieldTests
  Improve error message for installing plugin (#28298)
  ...
russcam added a commit to elastic/elasticsearch-net that referenced this pull request Apr 30, 2018
This commit patches the elasticsearch.bat file for 6.2 versions to include the
fix in PR elastic/elasticsearch#29086
russcam added a commit to elastic/elasticsearch-net that referenced this pull request Apr 30, 2018
This commit patches the elasticsearch.bat file for 6.2 versions to include the
fix in PR elastic/elasticsearch#29086
russcam added a commit to elastic/elasticsearch-net that referenced this pull request Apr 30, 2018
This commit patches the elasticsearch.bat file for 6.2 versions to include the
fix in PR elastic/elasticsearch#29086
(cherry picked from commit 41c586f)
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>bug :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team v6.3.0 v7.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants