Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Accumulo >> mail # dev >> Re: [11/15] ACCUMULO-1940 do not expose a new tablet to the memory manager until after it is online


Copy link to this message
-
Re: [11/15] ACCUMULO-1940 do not expose a new tablet to the memory manager until after it is online
I like the git emails, so I know when people push, but having 23 emails of
diffs is fairly useless. Though, after seeing this one, it makes me wonder
if the diffs are just incorrect in the first place...
On Sat, Nov 30, 2013 at 12:15 AM, Josh Elser <[EMAIL PROTECTED]> wrote:

> Actually, I was kind of confused when I saw your commit*s* on this ticket.
> What did you actually do? You have two commits that do the same changes:
>
> 82477f08aa64e2a8a1cf7f6af0db5ce954801ac8 (in 1.4, 1.5 and 1.6)
> 9b6b9cf104ff332cffdd4900d8057557e64e0ec8 (only in 1.6)\
>
> I would've only expected to see one email with a diff, followed by 2
> "merge" emails, e.g.
>
> ----------------------------------------------------------------------
>  .../tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java  | 2 --
>  1 file changed, 2 deletions(-)
> ----------------------------------------------------------------------
>
> Although, I will admit that dealing with 3 active branches is a big pain.
> However, I don't know of a better way to handle this in a way that doesn't
> make Git super confused and thus limit us in being able to answer questions
> like "where was a problem introduced" (git-bisect) and "where does this
> change exist" (and not having multiple commits that perform the same
> changes).
>
> On 11/29/13, 8:31 PM, Eric Newton wrote:
>
>> I changed one line of this file... git seems to be having a conniption.  I
>> find the volume of git traffic to be so useless that I ignore it.
>>
>> Anyone else?
>>
>>
>>
>>
>> On Fri, Nov 29, 2013 at 1:24 PM, <[EMAIL PROTECTED]> wrote:
>>
>>
>>> http://git-wip-us.apache.org/repos/asf/accumulo/blob/
>>> 9b6b9cf1/server/tserver/src/main/java/org/apache/accumulo/
>>> tserver/Tablet.java
>>> ----------------------------------------------------------------------
>>> diff --cc
>>> server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
>>> index ee3b243,0000000..fd76415
>>> mode 100644,000000..100644
>>> --- a/server/tserver/src/main/java/org/apache/accumulo/
>>> tserver/Tablet.java
>>> +++ b/server/tserver/src/main/java/org/apache/accumulo/
>>> tserver/Tablet.java
>>> @@@ -1,3868 -1,0 +1,3866 @@@
>>>   +/*
>>>   + * Licensed to the Apache Software Foundation (ASF) under one or more
>>>   + * contributor license agreements.  See the NOTICE file distributed
>>> with
>>>   + * this work for additional information regarding copyright ownership.
>>>   + * The ASF licenses this file to You under the Apache License, Version
>>> 2.0
>>>   + * (the "License"); you may not use this file except in compliance
>>> with
>>>   + * the License.  You may obtain a copy of the License at
>>>   + *
>>>   + *     http://www.apache.org/licenses/LICENSE-2.0
>>>   + *
>>>   + * Unless required by applicable law or agreed to in writing, software
>>>   + * distributed under the License is distributed on an "AS IS" BASIS,
>>>   + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> implied.
>>>   + * See the License for the specific language governing permissions and
>>>   + * limitations under the License.
>>>   + */
>>>   +package org.apache.accumulo.tserver;
>>>   +
>>>   +import java.io.ByteArrayInputStream;
>>>   +import java.io.DataInputStream;
>>>   +import java.io.FileNotFoundException;
>>>   +import java.io.IOException;
>>>   +import java.util.ArrayList;
>>>   +import java.util.Arrays;
>>>   +import java.util.Collection;
>>>   +import java.util.Collections;
>>>   +import java.util.Comparator;
>>>   +import java.util.EnumSet;
>>>   +import java.util.HashMap;
>>>   +import java.util.HashSet;
>>>   +import java.util.Iterator;
>>>   +import java.util.List;
>>>   +import java.util.Map;
>>>   +import java.util.Map.Entry;
>>>   +import java.util.PriorityQueue;
>>>   +import java.util.Set;
>>>   +import java.util.SortedMap;
>>>   +import java.util.TreeMap;
>>>   +import java.util.TreeSet;
>>>   +import java.util.concurrent.atomic.AtomicBoolean;
>>>   +import java.util.concurrent.atomic.AtomicLong;
>>>   +import java.util.concurrent.atomic.AtomicReference;