Re: branch_6x does not build

2017-06-29 Thread Karl Wright
Thanks, looks like the build issue is fixed!
Karl


On Thu, Jun 29, 2017 at 1:18 PM, Erick Erickson 
wrote:

> Yep, forgot to commit locally before I pushed after resolving merge
> conflicts from master. Sorry for the inconvenience. Should be fixed
> now.
>
> On Thu, Jun 29, 2017 at 4:18 AM, Karl Wright  wrote:
> > I pushed your core code fix along with my change.  I have no idea who
> broke
> > the tests; the test class itself hasn't been touched in a while, so I
> > suspect it was broken due to the changes Mr. Erickson committed.
> >
> > Karl
> >
> >
> > On Thu, Jun 29, 2017 at 6:30 AM, Mikhail Khludnev 
> wrote:
> >>
> >> Hi,
> >>
> >> I tried to fix
> >>
> >> $ git diff
> >>
> >> diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java
> >> b/solr/core/src/java/org/apache/solr/core/SolrCore.java
> >>
> >> index c02c748..e60f9dd 100644
> >>
> >> --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
> >>
> >> +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
> >>
> >> @@ -2833,7 +2833,7 @@ public final class SolrCore implements
> >> SolrInfoMBean, SolrMetricProducer, Closea
> >>
> >>  CoreDescriptor cd = getCoreDescriptor();
> >>
> >>  if (cd != null) {
> >>
> >>if (coreContainer != null) {
> >>
> >> -lst.add("aliases", coreContainer.getCoreNames(this));
> >>
> >> +lst.add("aliases", coreContainer.getNamesForCore(this));
> >>
> >>}
> >>
> >>CloudDescriptor cloudDesc = cd.getCloudDescriptor();
> >>
> >>if (cloudDesc != null) {
> >>
> >>
> >> but got the next compile errors
> >>
> >> common.compile-test:
> >>
> >> [mkdir] Created dir:
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/
> solr-core/classes/test
> >>
> >> [javac] Compiling 785 source files to
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/
> solr-core/classes/test
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:524:
> >> error: cannot find symbol
> >>
> >> [javac] JettySolrRunner jetty = jettys.get(0);
> >>
> >> [javac] ^
> >>
> >> [javac]   symbol:   class JettySolrRunner
> >>
> >> [javac]   location: class BasicDistributedZkTest
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:569:
> >> error: cannot find symbol
> >>
> >> [javac]   assertEquals(0,
> >> CollectionAdminRequest.createCollection(collection, "conf1",
> numShards, 1)
> >>
> >> [javac]   ^
> >>
> >> [javac]   symbol:   variable CollectionAdminRequest
> >>
> >> [javac]   location: class BasicDistributedZkTest
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:584:
> >> error: cannot find symbol
> >>
> >> [javac]
> >> assertTrue(CollectionAdminRequest.addReplicaToShard(collection,
> >> "shard"+((freezeI%numShards)+1))
> >>
> >> [javac]  ^
> >>
> >> [javac]   symbol:   variable CollectionAdminRequest
> >>
> >> [javac]   location: class BasicDistributedZkTest
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:118:
> >> error: cannot find symbol
> >>
> >> [javac] SolrClient client = clients.get(0);
> >>
> >> [javac] ^
> >>
> >> [javac]   symbol:   class SolrClient
> >>
> >> [javac]   location: class UnloadDistributedZkTest
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:170:
> >> error: cannot find symbol
> >>
> >> [javac] SolrClient client = clients.get(0);
> >>
> >> [javac] ^
> >>
> >> [javac]   symbol:   class SolrClient
> >>
> >> [javac]   location: class UnloadDistributedZkTest
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:383:
> >> error: cannot find symbol
> >>
> >> [javac] JettySolrRunner jetty = jettys.get(0);
> >>
> >> [javac] ^
> >>
> >> [javac]   symbol:   class JettySolrRunner
> >>
> >> [javac]   location: class UnloadDistributedZkTest
> >>
> >> [javac] Note: Some input files use or override a deprecated API.
> >>
> >> [javac] Note: Recompile with -Xlint:deprecation for details.
> >>
> >> [javac] Note: Some input files use unchecked or unsafe operations.
> >>
> >> [javac] Note: Recompile with -Xlint:unchecked for details.
> >>
> >> [javac] 6 errors
> >>
> >>
> >> common.compile-test:
> >>
> >> [javac] Compiling 737 source files to
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/
> solr-core/classes/test
> >>
> >> [javac]
> >> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/ap

Re: branch_6x does not build

2017-06-29 Thread Erick Erickson
Yep, forgot to commit locally before I pushed after resolving merge
conflicts from master. Sorry for the inconvenience. Should be fixed
now.

On Thu, Jun 29, 2017 at 4:18 AM, Karl Wright  wrote:
> I pushed your core code fix along with my change.  I have no idea who broke
> the tests; the test class itself hasn't been touched in a while, so I
> suspect it was broken due to the changes Mr. Erickson committed.
>
> Karl
>
>
> On Thu, Jun 29, 2017 at 6:30 AM, Mikhail Khludnev  wrote:
>>
>> Hi,
>>
>> I tried to fix
>>
>> $ git diff
>>
>> diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java
>> b/solr/core/src/java/org/apache/solr/core/SolrCore.java
>>
>> index c02c748..e60f9dd 100644
>>
>> --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
>>
>> +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
>>
>> @@ -2833,7 +2833,7 @@ public final class SolrCore implements
>> SolrInfoMBean, SolrMetricProducer, Closea
>>
>>  CoreDescriptor cd = getCoreDescriptor();
>>
>>  if (cd != null) {
>>
>>if (coreContainer != null) {
>>
>> -lst.add("aliases", coreContainer.getCoreNames(this));
>>
>> +lst.add("aliases", coreContainer.getNamesForCore(this));
>>
>>}
>>
>>CloudDescriptor cloudDesc = cd.getCloudDescriptor();
>>
>>if (cloudDesc != null) {
>>
>>
>> but got the next compile errors
>>
>> common.compile-test:
>>
>> [mkdir] Created dir:
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test
>>
>> [javac] Compiling 785 source files to
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:524:
>> error: cannot find symbol
>>
>> [javac] JettySolrRunner jetty = jettys.get(0);
>>
>> [javac] ^
>>
>> [javac]   symbol:   class JettySolrRunner
>>
>> [javac]   location: class BasicDistributedZkTest
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:569:
>> error: cannot find symbol
>>
>> [javac]   assertEquals(0,
>> CollectionAdminRequest.createCollection(collection, "conf1", numShards, 1)
>>
>> [javac]   ^
>>
>> [javac]   symbol:   variable CollectionAdminRequest
>>
>> [javac]   location: class BasicDistributedZkTest
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:584:
>> error: cannot find symbol
>>
>> [javac]
>> assertTrue(CollectionAdminRequest.addReplicaToShard(collection,
>> "shard"+((freezeI%numShards)+1))
>>
>> [javac]  ^
>>
>> [javac]   symbol:   variable CollectionAdminRequest
>>
>> [javac]   location: class BasicDistributedZkTest
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:118:
>> error: cannot find symbol
>>
>> [javac] SolrClient client = clients.get(0);
>>
>> [javac] ^
>>
>> [javac]   symbol:   class SolrClient
>>
>> [javac]   location: class UnloadDistributedZkTest
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:170:
>> error: cannot find symbol
>>
>> [javac] SolrClient client = clients.get(0);
>>
>> [javac] ^
>>
>> [javac]   symbol:   class SolrClient
>>
>> [javac]   location: class UnloadDistributedZkTest
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:383:
>> error: cannot find symbol
>>
>> [javac] JettySolrRunner jetty = jettys.get(0);
>>
>> [javac] ^
>>
>> [javac]   symbol:   class JettySolrRunner
>>
>> [javac]   location: class UnloadDistributedZkTest
>>
>> [javac] Note: Some input files use or override a deprecated API.
>>
>> [javac] Note: Recompile with -Xlint:deprecation for details.
>>
>> [javac] Note: Some input files use unchecked or unsafe operations.
>>
>> [javac] Note: Recompile with -Xlint:unchecked for details.
>>
>> [javac] 6 errors
>>
>>
>> common.compile-test:
>>
>> [javac] Compiling 737 source files to
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test
>>
>> [javac]
>> /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:587:
>> error: cannot find symbol
>>
>> [javac]   .setCoreName(collection + freezeI)
>>
>> [javac]   ^
>>
>> [javac]   symbol:   method setCoreName(String)
>>
>> [javac]   location: class AddReplica
>>
>>
>> On Thu, Jun 29, 2017 at 12:28 PM, Karl Wright  wrote:
>>>
>>> Problem is the following lines:
>>>
>>> >>
>>> acf30220 solr/core/src/java/org/apache/solr

Re: branch_6x does not build

2017-06-29 Thread Karl Wright
I pushed your core code fix along with my change.  I have no idea who broke
the tests; the test class itself hasn't been touched in a while, so I
suspect it was broken due to the changes Mr. Erickson committed.

Karl


On Thu, Jun 29, 2017 at 6:30 AM, Mikhail Khludnev  wrote:

> Hi,
>
> I tried to fix
>
> $ git diff
>
> diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java
> b/solr/core/src/java/org/apache/solr/core/SolrCore.java
>
> index c02c748..e60f9dd 100644
>
> --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
>
> +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
>
> @@ -2833,7 +2833,7 @@ public final class SolrCore implements
> SolrInfoMBean, SolrMetricProducer, Closea
>
>  CoreDescriptor cd = getCoreDescriptor();
>
>  if (cd != null) {
>
>if (coreContainer != null) {
>
> -lst.add("aliases", coreContainer.getCoreNames(this));
>
> +lst.add("aliases", coreContainer.getNamesForCore(this));
>
>}
>
>CloudDescriptor cloudDesc = cd.getCloudDescriptor();
>
>if (cloudDesc != null) {
>
>
> but got the next compile errors
>
> common.compile-test:
>
> [mkdir] Created dir: /home/mikhail_khludnev@epam.
> com/lucene-solr/solr/build/solr-core/classes/test
>
> [javac] Compiling 785 source files to /home/mikhail_khludnev@epam.
> com/lucene-solr/solr/build/solr-core/classes/test
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:524: error: cannot
> find symbol
>
> [javac] JettySolrRunner jetty = jettys.get(0);
>
> [javac] ^
>
> [javac]   symbol:   class JettySolrRunner
>
> [javac]   location: class BasicDistributedZkTest
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:569: error: cannot
> find symbol
>
> [javac]   assertEquals(0, 
> CollectionAdminRequest.createCollection(collection,
> "conf1", numShards, 1)
>
> [javac]   ^
>
> [javac]   symbol:   variable CollectionAdminRequest
>
> [javac]   location: class BasicDistributedZkTest
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:584: error: cannot
> find symbol
>
> [javac]   
> assertTrue(CollectionAdminRequest.addReplicaToShard(collection,
> "shard"+((freezeI%numShards)+1))
>
> [javac]  ^
>
> [javac]   symbol:   variable CollectionAdminRequest
>
> [javac]   location: class BasicDistributedZkTest
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:118: error:
> cannot find symbol
>
> [javac] SolrClient client = clients.get(0);
>
> [javac] ^
>
> [javac]   symbol:   class SolrClient
>
> [javac]   location: class UnloadDistributedZkTest
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:170: error:
> cannot find symbol
>
> [javac] SolrClient client = clients.get(0);
>
> [javac] ^
>
> [javac]   symbol:   class SolrClient
>
> [javac]   location: class UnloadDistributedZkTest
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/UnloadDistributedZkTest.java:383: error:
> cannot find symbol
>
> [javac] JettySolrRunner jetty = jettys.get(0);
>
> [javac] ^
>
> [javac]   symbol:   class JettySolrRunner
>
> [javac]   location: class UnloadDistributedZkTest
>
> [javac] Note: Some input files use or override a deprecated API.
>
> [javac] Note: Recompile with -Xlint:deprecation for details.
>
> [javac] Note: Some input files use unchecked or unsafe operations.
>
> [javac] Note: Recompile with -Xlint:unchecked for details.
>
> [javac] 6 errors
>
>
> common.compile-test:
>
> [javac] Compiling 737 source files to /home/mikhail_khludnev@epam.
> com/lucene-solr/solr/build/solr-core/classes/test
>
> [javac] /home/mikhail_khlud...@epam.com/lucene-solr/solr/core/src/
> test/org/apache/solr/cloud/BasicDistributedZkTest.java:587: error: cannot
> find symbol
>
> [javac]   .setCoreName(collection + freezeI)
>
> [javac]   ^
>
> [javac]   symbol:   method setCoreName(String)
>
> [javac]   location: class AddReplica
>
> On Thu, Jun 29, 2017 at 12:28 PM, Karl Wright  wrote:
>
>> Problem is the following lines:
>>
>> >>
>> acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
>> Erickson2017-04-12 21:55:52 -0700 2835)   if
>> (coreContainer != null) {
>> acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
>> Erickson2017-04-12 21:55:52 -0700 2836)
>> lst.add("aliases", coreContainer.getCoreNames(this));
>> c971f792 solr/core/src/java/

Re: branch_6x does not build

2017-06-29 Thread Mikhail Khludnev
Hi,

I tried to fix

$ git diff

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java
b/solr/core/src/java/org/apache/solr/core/SolrCore.java

index c02c748..e60f9dd 100644

--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java

+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java

@@ -2833,7 +2833,7 @@ public final class SolrCore implements SolrInfoMBean,
SolrMetricProducer, Closea

 CoreDescriptor cd = getCoreDescriptor();

 if (cd != null) {

   if (coreContainer != null) {

-lst.add("aliases", coreContainer.getCoreNames(this));

+lst.add("aliases", coreContainer.getNamesForCore(this));

   }

   CloudDescriptor cloudDesc = cd.getCloudDescriptor();

   if (cloudDesc != null) {


but got the next compile errors

common.compile-test:

[mkdir] Created dir: /home/
mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test

[javac] Compiling 785 source files to /home/
mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:524:
error: cannot find symbol

[javac] JettySolrRunner jetty = jettys.get(0);

[javac] ^

[javac]   symbol:   class JettySolrRunner

[javac]   location: class BasicDistributedZkTest

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:569:
error: cannot find symbol

[javac]   assertEquals(0,
CollectionAdminRequest.createCollection(collection, "conf1", numShards, 1)

[javac]   ^

[javac]   symbol:   variable CollectionAdminRequest

[javac]   location: class BasicDistributedZkTest

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:584:
error: cannot find symbol

[javac]
assertTrue(CollectionAdminRequest.addReplicaToShard(collection,
"shard"+((freezeI%numShards)+1))

[javac]  ^

[javac]   symbol:   variable CollectionAdminRequest

[javac]   location: class BasicDistributedZkTest

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:118:
error: cannot find symbol

[javac] SolrClient client = clients.get(0);

[javac] ^

[javac]   symbol:   class SolrClient

[javac]   location: class UnloadDistributedZkTest

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:170:
error: cannot find symbol

[javac] SolrClient client = clients.get(0);

[javac] ^

[javac]   symbol:   class SolrClient

[javac]   location: class UnloadDistributedZkTest

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java:383:
error: cannot find symbol

[javac] JettySolrRunner jetty = jettys.get(0);

[javac] ^

[javac]   symbol:   class JettySolrRunner

[javac]   location: class UnloadDistributedZkTest

[javac] Note: Some input files use or override a deprecated API.

[javac] Note: Recompile with -Xlint:deprecation for details.

[javac] Note: Some input files use unchecked or unsafe operations.

[javac] Note: Recompile with -Xlint:unchecked for details.

[javac] 6 errors


common.compile-test:

[javac] Compiling 737 source files to /home/
mikhail_khlud...@epam.com/lucene-solr/solr/build/solr-core/classes/test

[javac] /home/
mikhail_khlud...@epam.com/lucene-solr/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java:587:
error: cannot find symbol

[javac]   .setCoreName(collection + freezeI)

[javac]   ^

[javac]   symbol:   method setCoreName(String)

[javac]   location: class AddReplica

On Thu, Jun 29, 2017 at 12:28 PM, Karl Wright  wrote:

> Problem is the following lines:
>
> >>
> acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
> Erickson2017-04-12 21:55:52 -0700 2835)   if
> (coreContainer != null) {
> acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick
> Erickson2017-04-12 21:55:52 -0700 2836)
> lst.add("aliases", coreContainer.getCoreNames(this));
> c971f792 solr/core/src/java/org/apache/solr/core/SolrCore.java (Mark
> Robert Miller2012-07-05 20:36:05 + 2837)   }
> <<
>
> There is no getCoreNames() method in coreContainer.
>
> Could the perpetrator please fix this as fast as possible?  Thanks!!
>
> Karl
>
>


-- 
Sincerely yours
Mikhail Khludnev