Merge branch 'ecchronos-1.0'

emolsson · emolsson · commit 3355baff3b62 · 2019-09-23T10:30:14.000+02:00
diff --git a/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/CASLockFactory.java b/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/CASLockFactory.java
@@ -222,7 +222,7 @@ public Map<String, String> getLockMetadata(String dataCenter, String resource)
         }
         catch (Exception e)
         {
-            LOG.error("Unable to retrieve metadata for resource {}", resource, e);
+            LOG.warn("Unable to retrieve metadata for resource {}", resource, e);
         }
 
         return null;
@@ -333,7 +333,7 @@ private DistributedLock doTryLock(String dataCenter, String resource, int priori
 
         if (!sufficientNodesForLocking(dataCenter, resource))
         {
-            LOG.error("Not sufficient nodes to lock resource {} in datacenter {}", resource, dataCenter);
+            LOG.warn("Not sufficient nodes to lock resource {} in datacenter {}", resource, dataCenter);
             throw new LockException("Not sufficient nodes to lock");
         }
 
diff --git a/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/LockCollection.java b/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/LockCollection.java
@@ -49,7 +49,7 @@ public void close()
             }
             catch (Exception e)
             {
-                LOG.error("Unable to release lock {} ", lock, e);
+                LOG.warn("Unable to release lock {} ", lock, e);
             }
         }
     }
diff --git a/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/RepairLockFactoryImpl.java b/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/RepairLockFactoryImpl.java
@@ -101,7 +101,7 @@ private void releaseLocks(Collection<LockFactory.DistributedLock> locks)
             }
             catch (Exception e)
             {
-                LOG.error("Unable to release lock {} for {} ", lock, this, e);
+                LOG.warn("Unable to release lock {} for {} ", lock, this, e);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ public Map<String, String> getLockMetadata(String dataCenter, String resource)`
`222`	`222`	`}`
`223`	`223`	`catch (Exception e)`
`224`	`224`	`{`
`225`		`- LOG.error("Unable to retrieve metadata for resource {}", resource, e);`
	`225`	`+ LOG.warn("Unable to retrieve metadata for resource {}", resource, e);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`return null;`
`@@ -333,7 +333,7 @@ private DistributedLock doTryLock(String dataCenter, String resource, int priori`
`333`	`333`
`334`	`334`	`if (!sufficientNodesForLocking(dataCenter, resource))`
`335`	`335`	`{`
`336`		`- LOG.error("Not sufficient nodes to lock resource {} in datacenter {}", resource, dataCenter);`
	`336`	`+ LOG.warn("Not sufficient nodes to lock resource {} in datacenter {}", resource, dataCenter);`
`337`	`337`	`throw new LockException("Not sufficient nodes to lock");`
`338`	`338`	`}`
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void close()`
`49`	`49`	`}`
`50`	`50`	`catch (Exception e)`
`51`	`51`	`{`
`52`		`- LOG.error("Unable to release lock {} ", lock, e);`
	`52`	`+ LOG.warn("Unable to release lock {} ", lock, e);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private void releaseLocks(Collection<LockFactory.DistributedLock> locks)`
`101`	`101`	`}`
`102`	`102`	`catch (Exception e)`
`103`	`103`	`{`
`104`		`- LOG.error("Unable to release lock {} for {} ", lock, this, e);`
	`104`	`+ LOG.warn("Unable to release lock {} for {} ", lock, this, e);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`