").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g
=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/client/Ruby/docs/method_list.html b/client/Ruby/docs/method_list.html
new file mode 100644
index 00000000..4332e85c
--- /dev/null
+++ b/client/Ruby/docs/method_list.html
@@ -0,0 +1,2075 @@
+
+
+
+ Method List
+
+
+
+
+
+
+
+
+
#==
+
Juno::Client::JunoRequest
+
+
+
+
+
+
UINT16
+
Juno::IO::OffsetWidth
+
+
+
+
+
+
UINT32
+
Juno::IO::OffsetWidth
+
+
+
+
+
+
UINT64
+
Juno::IO::OffsetWidth
+
+
+
+
+
+
UINT8
+
Juno::IO::OffsetWidth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#create
+
Juno::Client::SyncClient
+
+
+
+
+
+
#create
+
Juno::Client::ReactClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#data
+
Juno::IO::MetadataComponent::MetadataField
+
+
+
+
+
+
#data_length
+
Juno::IO::PayloadComponent::CompressedPayloadData
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#delete
+
Juno::Client::CacheStore
+
+
+
+
+
+
+
+
+
+
+
#destroy
+
Juno::Client::ReactClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#exist?
+
Juno::Client::ReactClient
+
+
+
+
+
+
#exist?
+
Juno::Client::CacheStore
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#expiry
+
Juno::IO::JunoMessage
+
+
+
+
+
+
+
+
+
+
+
#field_bytes
+
Juno::IO::MetadataComponentTemplate::SourceInfoField
+
+
+
+
+
+
+
+
+
+
+
#full?
+
Juno::Net::RequestQueue
+
+
+
+
+
+
#get
+
Juno::Client::SyncClient
+
+
+
+
+
+
get
+
Juno::ServerStatus
+
+
+
+
+
+
get
+
Juno::IO::JunoMessage::OperationType
+
+
+
+
+
+
get
+
Juno::Client::OperationStatus
+
+
+
+
+
+
#get
+
Juno::Client::ReactClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#host
+
Juno::Net::IOProcessor
+
+
+
+
+
+
+
+
+
+
+
#init
+
Juno::Net::WorkerPool
+
+
+
+
+
+
+
+
+
+
+
#initialize
+
Juno::IO::MetadataComponent::MetadataField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#ip
+
Juno::IO::JunoMessage
+
+
+
+
+
+
#ip
+
Juno::IO::MetadataComponent
+
+
+
+
+
+
#ip
+
Juno::Net::PingMessage
+
+
+
+
+
+
#ipv6?
+
Juno::IO::MetadataComponentTemplate::SourceInfoField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#key
+
Juno::Client::RecordContext
+
+
+
+
+
+
#key
+
Juno::Client::JunoResponse
+
+
+
+
+
+
#key
+
Juno::Client::JunoRequest
+
+
+
+
+
+
#key
+
Juno::IO::JunoMessage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
op_count
+
Juno::Client::ReactClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#padding_size
+
Juno::IO::MetadataComponentTemplate::CorrelationIDField
+
+
+
+
+
+
#padding_size
+
Juno::IO::MetadataComponentTemplate::SourceInfoField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#pop
+
Juno::Net::RequestQueue
+
+
+
+
+
+
#port
+
Juno::IO::JunoMessage
+
+
+
+
+
+
+
+
+
+
+
#port
+
Juno::Net::IOProcessor
+
+
+
+
+
+
#port
+
Juno::IO::MetadataComponent
+
+
+
+
+
+
#port
+
Juno::Net::PingMessage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#push
+
Juno::Net::RequestQueue
+
+
+
+
+
+
+
+
+
+
+
#read
+
Juno::Net::PingMessage
+
+
+
+
+
+
#read
+
Juno::IO::MetadataComponent
+
+
+
+
+
+
#read
+
Juno::Client::CacheStore
+
+
+
+
+
+
#read
+
Juno::IO::OperationMessage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
recv
+
Juno::Client::ReactClient
+
+
+
+
+
+
#req_id
+
Juno::Net::QueueEntry
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#run
+
Juno::Net::IOProcessor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#set
+
Juno::Client::SyncClient
+
+
+
+
+
+
#set
+
Juno::Client::ReactClient
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#size
+
Juno::IO::OperationMessage
+
+
+
+
+
+
#size
+
Juno::Net::RequestQueue
+
+
+
+
+
+
#size
+
Juno::IO::MetadataComponent::MetadataField
+
+
+
+
+
+
#size_type
+
Juno::IO::MetadataComponent::MetadataField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#status
+
Juno::Client::JunoResponse
+
+
+
+
+
+
#stop
+
Juno::Client::ReactClient
+
+
+
+
+
+
#stop
+
Juno::Net::IOProcessor
+
+
+
+
+
+
#stop
+
Juno::Net::WorkerPool
+
+
+
+
+
+
#stop
+
Juno::Net::RequestQueue
+
+
+
+
+
+
+
+
+
+
+
#tag
+
Juno::IO::MetadataComponent::MetadataField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#to_s
+
Juno::Client::JunoRequest
+
+
+
+
+
+
#type
+
Juno::Client::JunoRequest
+
+
+
+
+
+
#unbind
+
Juno::Net::ClientHandler
+
+
+
+
+
+
#update
+
Juno::Client::SyncClient
+
+
+
+
+
+
#update
+
Juno::Client::ReactClient
+
+
+
+
+
+
#url
+
Juno::ConfigReader
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
valid?
+
Juno::IO::CompressionType
+
+
+
+
+
+
valid?
+
Juno::IO::ProtocolHeader::OpCodes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#value
+
Juno::IO::JunoMessage
+
+
+
+
+
+
#value
+
Juno::IO::PayloadComponent
+
+
+
+
+
+
#value
+
Juno::Client::JunoRequest
+
+
+
+
+
+
#value
+
Juno::Client::JunoResponse
+
+
+
+
+
+
#version
+
Juno::Client::RecordContext
+
+
+
+
+
+
+
+
+
+
+
#version
+
Juno::IO::MetadataComponent
+
+
+
+
+
+
#version
+
Juno::Client::JunoRequest
+
+
+
+
+
+
#write
+
Juno::IO::MetadataComponent
+
+
+
+
+
+
#write
+
Juno::Client::CacheStore
+
+
+
+
+
+
#write
+
Juno::IO::OperationMessage
+
+
+
+
+
+
#write
+
Juno::Net::PingMessage
+
+
+
+
+
+
+ Top Level Namespace
+
+ — Documentation by YARD 0.9.34
+
+
+
+
+
+
+
Top Level Namespace
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Defined Under Namespace
+
+
+
+ Modules: Juno
+
+
+
+
+
+
+
+
+
+
+
+
+
+
]
+ @metadata_field_list = []
+ end
+
+ # @param ttl [Integer] - Record Time to live
+ def set_time_to_live(ttl)
+ ttl = ttl.to_i
+ raise ArgumentError, 'TTL should be > 0' unless ttl.positive?
+
+ @time_to_live = ttl
+ ttl = [ttl].pack(OffsetWidth.UINT32)
+ add_field(MetadataField.new(0x01, 0x01, ttl))
+ end
+
+ # @param version [Integer] - Record version
+ def set_version(data)
+ @version = data
+ version_bytes_string = [data].pack(OffsetWidth.UINT32)
+ add_field(MetadataField.new(0x02, 0x01, version_bytes_string))
+ end
+
+ # @param creation_time [Integer] - Unix timestamp (required)
+ def set_creation_time(data)
+ @creation_time = data
+ creation_time_bytes_string = [data].pack(OffsetWidth.UINT32)
+ add_field(MetadataField.new(0x03, 0x01, creation_time_bytes_string))
+ end
+
+ def set_expiration_time(data)
+ @expiration_time = data
+ expiration_time_bytes_string = [data].pack(OffsetWidth.UINT32)
+ add_field(MetadataField.new(0x04, 0x01, expiration_time_bytes_string))
+ end
+
+ # @param input_uuid_byte_string [String] - Record Time to live (optional)
+ # if not provided, creates a uuid itself
+ def set_request_uuid(input_uuid_byte_string = nil)
+ @request_uuid = if input_uuid_byte_string.nil?
+ UUIDTools::UUID.random_create
+ else
+ UUIDTools::UUID.parse_raw(input_uuid_byte_string)
+ end
+ add_field(MetadataField.new(0x05, 0x03, @request_uuid.raw))
+ @request_uuid
+ end
+
+ # SourceInfoField
+ # @param app_name [String] - Record Time to live (required)
+ # @param ip [IPAddr] - ip address for component (required)
+ # @param port [Integer] (required)
+ def set_source_info(app_name:, ip:, port:)
+ @ip = ip
+ @port = port
+ @app_name = app_name
+ data = MetadataComponentTemplate::SourceInfoField.new
+ data.app_name = app_name
+ data.ip = ip.hton
+ data.port = port
+ str_io = StringIO.new
+ data.write(str_io)
+ add_field(MetadataField.new(0x06, 0x00, str_io.string))
+ end
+
+ def set_last_modification(data)
+ @last_modification = data
+ last_modification_bytes_string = [data].pack(OffsetWidth.UINT64)
+ add_field(MetadataField.new(0x07, 0x02, last_modification_bytes_string))
+ end
+
+ # @param input_uuid_byte_string [String] (optional)
+ # if not provided, creates a uuid itself
+ def set_originator_request_id(input_uuid_byte_string = nil)
+ @originator_request_id = if input_uuid_byte_string.nil?
+ UUIDTools::UUID.random_create
+ else
+ UUIDTools::UUID.parse_raw(input_uuid_byte_string)
+ end
+ add_field(MetadataField.new(0x08, 0x03, @originator_request_id.raw))
+ @originator_request_id
+ end
+
+ # @param input_uuid_byte_string [String] (optional)
+ # if not provided, creates a uuid itself
+ def set_correlation_id(input_uuid_byte_string = nil)
+ @correlation_id = if input_uuid_byte_string.nil?
+ UUIDTools::UUID.random_create
+ else
+ UUIDTools::UUID.parse_raw(input_uuid_byte_string)
+ end
+ field = MetadataComponentTemplate::CorrelationIDField.new
+ field.correlation_id = @correlation_id.raw
+ str_io = StringIO.new
+ field.write(str_io)
+ # puts field
+ add_field(MetadataField.new(0x09, 0x0, str_io.string))
+ end
+
+ def set_request_handling_time(data)
+ @request_handling_time = data
+ request_handling_time_bytes_string = [data].pack(OffsetWidth.UINT32)
+ add_field(MetadataField.new(0x0A, 0x01, request_handling_time_bytes_string))
+ end
+
+ # Function to add feild to the list
+ # @param field [MetadataField] (required)
+ def add_field(field)
+ metadata_field_list.push(field)
+ end
+
+ # function to calculate size of metadata component
+ def num_bytes
+ io = StringIO.new
+ write(io)
+ io.size
+ end
+
+ # Function to serialize Component to buffer
+ # @param io [StringIO] (required)
+ def write(io)
+ buffer = MetadataComponentTemplate.new
+ buffer.number_of_fields = metadata_field_list.length
+ metadata_field_list.each do |field|
+ f = MetadataComponentTemplate::MetadataHeaderField.new
+ f.size_type = field.size_type
+ f.field_tag = field.tag
+ buffer.metadata_fields.push(f)
+ end
+
+ body = StringIO.new
+ metadata_field_list.each do |field|
+ body.write(field.data)
+ end
+ padding_size = (8 - body.size % 8) % 8
+ body.write(Array.new(0, padding_size).pack(OffsetWidth.UINT8('*'))) if padding_size.positive?
+ buffer.body = body.string
+
+ buffer.write(io)
+ end
+
+ # Function to de-serialize Component to buffer
+ # @param io [StringIO] (required)
+ def read(io)
+ metadata_component = MetadataComponentTemplate.new
+ metadata_component.read(io)
+
+ body_buffer = StringIO.new(metadata_component.body)
+
+ metadata_component.metadata_fields.each do |field|
+ case field.field_tag
+ when TagAndType::TimeToLive[:tag]
+ ttl_byte_string = body_buffer.read(1 << (1 + TagAndType::TimeToLive[:size_type]))
+ set_time_to_live(ttl_byte_string.unpack1(OffsetWidth.UINT32))
+
+ when TagAndType::Version[:tag]
+ version_byte_string = body_buffer.read(1 << (1 + TagAndType::Version[:size_type]))
+ set_version(version_byte_string.unpack1(OffsetWidth.UINT32))
+
+ when TagAndType::CreationTime[:tag]
+ creation_time_byte_string = body_buffer.read(1 << (1 + TagAndType::CreationTime[:size_type]))
+ set_creation_time(creation_time_byte_string.unpack1(OffsetWidth.UINT32))
+
+ when TagAndType::RequestUUID[:tag]
+ request_uuid_byte_string = body_buffer.read(1 << (1 + TagAndType::RequestUUID[:size_type]))
+ set_request_uuid(request_uuid_byte_string)
+
+ when TagAndType::SourceInfo[:tag]
+ source_info = MetadataComponentTemplate::SourceInfoField.new
+ source_info.read(body_buffer)
+ set_source_info(app_name: source_info.app_name, ip: IPAddr.new_ntoh(source_info.ip), port: source_info.port)
+
+ when TagAndType::LastModification[:tag]
+ last_modification_byte_string = body_buffer.read(1 << (1 + TagAndType::LastModification[:size_type]))
+ set_last_modification(last_modification_byte_string.unpack1(OffsetWidth.UINT64))
+
+ when TagAndType::ExpirationTime[:tag]
+ expiration_time_byte_string = body_buffer.read(1 << (1 + TagAndType::ExpirationTime[:size_type]))
+ set_expiration_time(expiration_time_byte_string.unpack1(OffsetWidth.UINT32))
+
+ when TagAndType::OriginatorRequestID[:tag]
+ originator_request_id_byte_string = body_buffer.read(1 << (1 + TagAndType::OriginatorRequestID[:size_type]))
+ set_originator_request_id(originator_request_id_byte_string)
+ # when TagAndType::CorrelationID[:tag]
+
+ when TagAndType::RequestHandlingTime[:tag]
+ request_handling_time_byte_string = body_buffer.read(1 << (1 + TagAndType::RequestHandlingTime[:size_type]))
+ set_request_handling_time(request_handling_time_byte_string.unpack1(OffsetWidth.UINT32))
+ end
+ end
+ end
+
+ class TagAndType
+ TimeToLive = {
+ tag: 0x01,
+ size_type: 0x01
+ }.freeze
+ Version = {
+ tag: 0x02,
+ size_type: 0x01
+ }.freeze
+ CreationTime = {
+ tag: 0x03,
+ size_type: 0x01
+ }.freeze
+ RequestUUID = {
+ tag: 0x05,
+ size_type: 0x03
+ }.freeze
+ SourceInfo = {
+ tag: 0x06,
+ size_type: 0x00
+ }.freeze
+ ExpirationTime = {
+ tag: 0x04,
+ size_type: 0x01
+ }.freeze
+ LastModification = {
+ tag: 0x07,
+ size_type: 0x02
+ }.freeze
+ OriginatorRequestID = {
+ tag: 0x08,
+ size_type: 0x03
+ }.freeze
+ CorrelationID = {
+ tag: 0x09,
+ size_type: 0x00
+ }.freeze
+ RequestHandlingTime = {
+ tag: 0x0A,
+ size_type: 0x01
+ }.freeze
+ end
+
+ # DataType for @metadata_field_list
+ class MetadataField
+ attr_accessor :tag, :size_type, :data
+
+ def initialize(tag, size_type, data)
+ @tag = tag
+ @size_type = size_type
+ @data = data
+ end
+
+ def size
+ if size_type == SizeType::Variable
+ data.length
+ else
+ 1 << (size_type + 1)
+ end
+ end
+
+ class SizeType
+ Variable = 0
+ end
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/IO/MetadataComponentTemplate.rb b/client/Ruby/juno/lib/juno/IO/MetadataComponentTemplate.rb
new file mode 100644
index 00000000..95d19486
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/IO/MetadataComponentTemplate.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Juno
+ module IO
+ class MetadataComponentTemplate < BinData::Record
+ class MetadataHeaderField < BinData::Record
+ bit3 :size_type
+ bit5 :field_tag
+ end
+
+ class FixedLengthField < BinData::Record
+ mandatory_parameter :field_length
+
+ string :data, read_length: :field_length
+ end
+
+ class SourceInfoField < BinData::Record
+ def field_bytes
+ field_length.num_bytes + app_name_length.num_bytes + port.num_bytes + ip.num_bytes + app_name.num_bytes
+ end
+
+ def padding_size
+ (4 - field_bytes % 4) % 4
+ end
+
+ def ipv6?
+ IPAddr.new_ntoh(ip).ipv6?
+ end
+
+ endian :big
+ uint8 :field_length, value: -> { field_bytes + padding.num_bytes }
+ uint8 :app_name_length, value: -> { ipv6? ? app_name.length | 128 : app_name.length }
+ uint16 :port
+ string :ip, read_length: -> { app_name_length & 128 == 1 ? 16 : 4 }
+ string :app_name, read_length: :app_name_length
+ string :padding, length: :padding_size
+ end
+
+ class CorrelationIDField < BinData::Record
+ def padding_size
+ size = component_size.num_bytes + correlation_id_length.num_bytes + correlation_id.num_bytes
+ (4 - size % 4) % 4
+ end
+
+ endian :big
+ uint8 :component_size, value: -> { num_bytes }
+ uint8 :correlation_id_length, value: -> { correlation_id.length }
+ string :correlation_id
+ string :padding, length: :padding_size
+ end
+
+ def header_num_bytes
+ component_size.num_bytes + tag_id.num_bytes + number_of_fields.num_bytes + metadata_fields.num_bytes
+ end
+
+ def header_padding_length
+ (4 - header_num_bytes % 4) % 4
+ end
+
+ endian :big
+ uint32 :component_size, value: -> { num_bytes }
+ uint8 :tag_id, value: 0x02
+ uint8 :number_of_fields, value: -> { metadata_fields.length }
+ array :metadata_fields, initial_length: :number_of_fields, type: :metadata_header_field
+ string :header_padding, length: :header_padding_length # implement padding length
+
+ string :body, read_length: lambda {
+ component_size - 4 - 1 - 1 - number_of_fields - header_padding.num_bytes
+ }
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/IO/OperationMessage.rb b/client/Ruby/juno/lib/juno/IO/OperationMessage.rb
new file mode 100644
index 00000000..4eba9f08
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/IO/OperationMessage.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Juno
+ module IO
+ class OperationMessage
+ attr_accessor :protocol_header, :metadata_component, :payload_component
+
+ def initialize
+ @protocol_header = ProtocolHeader.new
+ @metadata_component = nil
+ @payload_component = nil
+ end
+
+ # Calculates size of message
+ def size
+ total_size = protocol_header.num_bytes
+ total_size += payload_component.num_bytes unless payload_component.nil?
+ total_size += metadata_component.num_bytes unless metadata_component.nil?
+ total_size
+ end
+
+ # Function to serialize message to buffer
+ # @param io [StringIO] (required)
+ def write(io)
+ protocol_header.message_size = size
+
+ protocol_header.write(io)
+ metadata_component&.write(io)
+ payload_component&.write(io)
+ nil
+ end
+
+ # Function to de-serialize message to buffer
+ # @param io [StringIO] (required)
+ def read(io)
+ return if io.eof? || (io.size - io.pos) < 16
+
+ @protocol_header = ProtocolHeader.new
+ @metadata_component = MetadataComponent.new
+ @payload_component = PayloadComponent.new
+
+ @protocol_header.read(io)
+
+ remaining_size = protocol_header.message_size - 16
+ prev_position = io.pos
+
+ @metadata_component.read(io) if !io.eof? && (io.size - io.pos) >= remaining_size
+
+ remaining_size -= (io.pos - prev_position)
+
+ @payload_component.read(io) if !io.eof? && (io.size - io.pos) >= remaining_size
+ nil
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/IO/PayloadComponent.rb b/client/Ruby/juno/lib/juno/IO/PayloadComponent.rb
new file mode 100644
index 00000000..4c2e426f
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/IO/PayloadComponent.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+module Juno
+ module IO
+ # ** Payload (or KeyValue) Component **
+ #
+ # A 12-byte header followed by name, key and value
+ # Tag/ID: 0x01
+ # * Header *
+ #
+ # |0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|
+ # | 0| 1| 2| 3|
+ # ------+---------------+---------------+---------------+---------------+
+ # 0 | Size |
+ # ------+---------------+---------------+-------------------------------+
+ # 4 | Tag/ID (0x01) | namespace len | key length |
+ # ------+---------------+---------------+-------------------------------+
+ # 8 | payload length |
+ # ------+---------------------------------------------------------------+
+ #
+ # (
+ # The max namespace length: 255
+ # payload length = 0 if len(payload data) = 0, otherwise,
+ # payload length = 1 + len(payload data) = len(payload field)
+ # )
+ #
+ #
+ # * Body *
+ # +---------+-----+---------------+-------------------------+
+ # |namespace| key | payload field | Padding to align 8-byte |
+ # +---------+-----+---------------+-------------------------+
+ #
+ # * Payload field*
+ # +---------------------+--------------+
+ # | 1 byte payload type | Payload data |
+ # +---------------------+--------------+
+ #
+ # * Payload Type
+ # 0: payload data is the actual value passed from client user
+ # 1: payload data is encrypted by Juno client library, details not specified
+ # 2: payload data is encrypted by Juno proxy with AES-GCM. encryption key length is 256 bits
+ # 3: Payload data is compressed by Juno Client library.
+ #
+ # * Payload data
+ # for payload type 2
+ # +--------------------------------+----------------+----------------+
+ # | 4 bytes encryption key version | 12 bytes nonce | encrypted data |
+ # +--------------------------------+----------------+----------------+
+ #
+ # for payload type 3
+ # +---------------------------------+------------------+----------------+
+ # | 1 byte size of compression type | compression type | compressed data|
+ # +---------------------------------+------------------+----------------+
+ #
+ # * compression type
+ # 1) snappy (default algorithm)
+ # 2) TBD
+ class PayloadComponent < BinData::Record
+ class EncryptedPayloadData < BinData::Record
+ mandatory_parameter :payload_data_length
+ end
+
+ class CompressedPayloadData < BinData::Record
+ mandatory_parameter :payload_data_length
+ def data_length
+ eval_parameter(:payload_data_length) - 1 - compression_type
+ end
+
+ uint8 :compression_type_size, value: -> { :compression_type.length }
+ string :compression_type, read_length: :compression_type_size, initial_value: CompressionType::None
+ string :data, read_length: :data_length
+ end
+
+ # class PayloadBody < BinData::Record
+ # mandatory_parameter :payload_length
+ # uint8 :payload_type, initial_value: PayloadType::UnCompressed, only_if: -> { :payload_length.positive? } # optional
+
+ # choice :payload_data, selection: :payload_type, only_if: -> { :payload_length.positive? } do
+ # compressed_payload_data PayloadType::Compressed, payload_data_length: lambda {
+ # get_payload_data_length
+ # }
+
+ # uncompressed_payload_data PayloadType::UnCompressed, payload_data_length: lambda {
+ # get_payload_data_length
+ # }
+
+ # encrypted_payload_data PayloadType::Encrypted, payload_data_length: lambda {
+ # get_payload_data_length
+ # }
+ # end
+ # end
+
+ class UncompressedPayloadData < BinData::Record
+ mandatory_parameter :payload_data_length
+ string :data, read_length: :payload_data_length
+ end
+
+ def get_payload_data_length
+ (payload_length.positive? ? payload_length - 1 : 0)
+ end
+
+ # to prevent stack overflow
+ def custom_num_bytes
+ size = component_size.num_bytes + tag_id.num_bytes + namespace_length.num_bytes + key_length.num_bytes + payload_length.num_bytes + namespace.num_bytes + payload_key.num_bytes
+ size += payload_type.num_bytes + payload_data.num_bytes if payload_length.positive?
+ size
+ end
+
+ def padding_length
+ (8 - custom_num_bytes % 8) % 8
+ end
+
+ endian :big
+ uint32 :component_size, value: -> { num_bytes }
+ uint8 :tag_id, value: 0x01
+ uint8 :namespace_length, value: -> { namespace.length }
+ uint16 :key_length, value: -> { payload_key.length }
+ uint32 :payload_length, value: -> { payload_data.num_bytes.zero? ? 0 : payload_data.num_bytes + 1 }
+ string :namespace, read_length: :namespace_length # required
+ string :payload_key, read_length: :key_length # required
+ uint8 :payload_type, onlyif: lambda {
+ payload_length.positive?
+ }, initial_value: PayloadType::UnCompressed # optional
+
+ choice :payload_data, selection: :payload_type, onlyif: -> { payload_length.positive? } do
+ compressed_payload_data PayloadType::Compressed, payload_data_length: lambda {
+ get_payload_data_length
+ }
+
+ uncompressed_payload_data PayloadType::UnCompressed, payload_data_length: lambda {
+ get_payload_data_length
+ }
+
+ encrypted_payload_data PayloadType::Encrypted, payload_data_length: lambda {
+ get_payload_data_length
+ }
+ end
+ string :padding, length: :padding_length
+
+ def set_value(input_value, compression_type = CompressionType::None)
+ if compression_type != CompressionType::None
+ self.payload_type = PayloadType::Compressed
+ payload_data.compression_type = compression_type
+ else
+ self.payload_type = PayloadType::UnCompressed
+ end
+ payload_data.data = input_value
+ end
+
+ def value
+ payload_data.data
+ end
+
+ def compressed?
+ return true if payload_type == PayloadType::Compressed
+
+ false
+ end
+
+ def compression_type
+ return payload_data.compression_type if compressed?
+
+ CompressionType::None
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/IO/ProtocolHeader.rb b/client/Ruby/juno/lib/juno/IO/ProtocolHeader.rb
new file mode 100644
index 00000000..8229797d
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/IO/ProtocolHeader.rb
@@ -0,0 +1,181 @@
+# frozen_string_literal: true
+
+module Juno
+ # Juno wire protocol consists of a 12-byte header. Depending on the type, the appropriate message payload follows the fixed header section. Following is the header protocol:
+ #
+ # | 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7|
+ # byte | 0| 1| 2| 3|
+ # ------+-----------------------+-----------------------+-----------------------+-----------------------+
+ # 0 | magic | version | message type flag |
+ # | | +-----------------+-----+
+ # | | | type | RQ |
+ # ------+-----------------------------------------------+-----------------------+-----------------+-----+
+ # 4 | message size |
+ # ------+-----------------------------------------------------------------------------------------------+
+ # 8 | opaque |
+ # ------+-----------------------------------------------------------------------------------------------+
+ #
+ # Following is the detailed description of each field in the header:
+ #
+ # offset name size (bytes) meaning
+ # 0 Magic 2
+ # Magic number, used to identify Juno message.
+ #
+ # '0x5050'
+ #
+ # 2 Version 1 Protocol version, current version is 1.
+ # 3 Message Type flag
+ # 1 bit 0-5
+ # Message Type
+ #
+ # 0: Operational Message
+ #
+ # 1: Admin Message
+ #
+ # 2: Cluster Control Message
+ #
+ # bit 6-7
+ # RQ flag
+ #
+ # 0: response
+ #
+ # 1: two way request
+ #
+ # 3: one way request
+ #
+ # 4 Message size 4 Specifies the length of the message
+ # 8 Opaque 4 The Opaque data set in the request will be copied back in the response
+ # Operational Message
+ # Client Info (ip, port, type, application name)
+ # Request Type: request or response
+ # Operation Type: Create, Get, Update, Delete
+ # Request Id
+ # Request Info (key, ttl, version, namespace)
+ # Payload data size
+ # Payload
+ # Response Info (status/error code, error string)
+ # Flag
+ # Before defining the details of the protocol for operational message, we need to review, and finalize somethings at page.
+ #
+ # Operational Message Header
+ #
+ # operational request header
+ # |0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|
+ # byte | 0| 1| 2| 3|
+ # ------+---------------+---------------+---------------+---------------+
+ # 0 | opcode |flag | shard Id |
+ # | +-+-------------+ |
+ # | |R| | |
+ # ------+---------------+-+-------------+-------------------------------+
+ #
+ # operational response header
+ # |0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|0|1|2|3|4|5|6|7|
+ # byte | 0| 1| 2| 3|
+ # ------+---------------+---------------+---------------+---------------+
+ # 0 | opcode |flag | reserved | status |
+ # | +-+-------------+ | |
+ # | |R| | | |
+ # ------+---------------+-+-------------+---------------+---------------+
+ #
+ # opcode:
+ # 0x00 Nop
+ # 0x01 Create
+ # 0x02 Get
+ # 0x03 Update
+ # 0x04 Set
+ # 0x05 Destroy
+ # 0x81 PrepareCreate
+ # 0x82 Read
+ # 0x83 PrepareUpdate
+ # 0x84 PrepareSet
+ # 0x85 PrepareDelete
+ # 0x86 Delete
+ # 0xC1 Commit
+ # 0xC2 Abort (Rollback)
+ # 0xC3 Repair
+ # 0xC4 MarkDelete
+ # 0xE1 Clone
+ # 0xFE MockSetParam
+ # oxFF MockReSet
+ # R:
+ # 1 if it is for replication
+ # shard Id:
+ # only meaning for request to SS
+ # status:
+ # 1 byte, only meaningful for response
+ #
+ module IO
+ class ProtocolHeader < BinData::Record
+ class MessageTypes
+ OperationalMessage = 0
+ AdminMessage = 1
+ ClusterControlMessage = 2
+ end
+
+ class RequestTypes
+ Response = 0
+ TwoWayRequest = 1
+ OneWayRequest = 2
+ end
+
+ class OpCodes
+ Nop = 0x00
+ Create = 0x01
+ Get = 0x02
+ Update = 0x03
+ Set = 0x04
+ Destroy = 0x05
+ PrepareCreate = 0x81
+ Read = 0x82
+ PrepareUpdate = 0x83
+ PrepareSet = 0x84
+ PrepareDelete = 0x85
+ Delete = 0x86
+ Commit = 0xC1
+ Abort = 0xC2
+ Repair = 0xC3
+ MarkDelete = 0xC4
+ Clone = 0xE1
+ MockSetParam = 0xFE
+ MockReSet = 0xFF
+
+ def self.valid?(opcode)
+ constants.each do |constant|
+ return true if const_get(constant) == opcode
+ end
+ false
+ end
+ end
+
+ class MessageTypeFlag < BinData::Record
+ bit2 :message_request_type, initial_value: ProtocolHeader::RequestTypes::TwoWayRequest
+ bit6 :message_type, initial_value: ProtocolHeader::MessageTypes::OperationalMessage
+ end
+
+ def request?
+ message_type_flag.message_request_type != RequestTypes::Response
+ end
+
+ endian :big
+ uint16 :magic, value: 0x5050
+ uint8 :version, value: 1
+ message_type_flag :message_type_flag
+ uint32 :message_size
+ uint32 :opaque, initial_value: 0
+ uint8 :opcode, initial_value: OpCodes::Nop
+ uint8 :flag, value: 0
+
+ uint16 :shard_id, value: 0, onlyif: -> { request? }
+ uint8 :reserved, onlyif: -> { !request? }
+ uint8 :status, onlyif: -> { !request? }
+
+ def request_type
+ message_type_flag.message_request_type
+ end
+
+ def message_type
+ message_type_flag.message_type
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/IO/constants.rb b/client/Ruby/juno/lib/juno/IO/constants.rb
new file mode 100644
index 00000000..543f24ef
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/IO/constants.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Top module for juno client
+module Juno
+ # Submodule containing modules related to WireProtocol
+ module IO
+ class OffsetWidth
+ # Count can be integer or '*'
+ def self.UINT64(count = '')
+ "Q#{count}"
+ end
+
+ def self.UINT32(count = '')
+ "N#{count}"
+ end
+
+ def self.UINT16(count = '')
+ "n#{count}"
+ end
+
+ def self.UINT8(count = '')
+ "C#{count}"
+ end
+ end
+
+ # Class containing constants for CompressionType
+ class CompressionType
+ None = 'None'
+ Snappy = 'Snappy'
+
+ def self.valid?(compression_type)
+ constants.each do |constant|
+ return true if const_get(constant) == compression_type
+ end
+ false
+ end
+ end
+
+ # Class containing constants for PayloadType
+ class PayloadType
+ UnCompressed = 0x00
+ Encrypted = 0x02
+ Compressed = 0x03
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/base_processor.rb b/client/Ruby/juno/lib/juno/Net/base_processor.rb
new file mode 100644
index 00000000..79c71712
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/base_processor.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Juno
+ module Net
+ # BaseProcessor - base class for IOProcessor
+ # Handles logic for reading and writing ping_ip for bypass ltm
+ class BaseProcessor
+ def initialize(_ = nil)
+ @ping_queue = SizedQueue.new(1)
+ end
+
+ def ping_ip=(ip)
+ @ping_queue.push(ip)
+ end
+
+ def ping_ip
+ begin
+ ip = @ping_queue.pop(true)
+ rescue ThreadError
+ return nil
+ end
+
+ return nil if ip.to_s.empty?
+
+ begin
+ IPAddr.new(ip)
+ rescue StandardError
+ nil
+ end
+ end
+
+ def clear_ping_queue
+ @ping_queue.clear
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/client_handler.rb b/client/Ruby/juno/lib/juno/Net/client_handler.rb
new file mode 100644
index 00000000..22ecc323
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/client_handler.rb
@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module Juno
+ module Net
+ # Hanldes connection creation and receiving data asynchronously
+ # Managed by EventMachine::Connection
+ class ClientHandler < EventMachine::Connection
+ # Constant to count messages received
+ @@recv_count = Concurrent::AtomicFixnum.new(0)
+
+ def self.received_messages
+ @@recv_count.value
+ end
+
+ # Constructor
+ # @param io_processor (Juno::Net::IOProcessor)
+ def initialize(io_processor)
+ super
+ @PROG_NAME = self.class.name
+ @LOGGER = Juno::Logger.instance
+ @io_processor = io_processor
+ @channel = self
+ @connected = Concurrent::AtomicBoolean.new(false)
+ @ssl_connected = Concurrent::AtomicBoolean.new(false)
+ end
+
+ # Method called once for each instance of Juno::Net::ClientHandler at initialization
+ def post_init
+ start_tls_connection if use_ssl?
+ end
+
+ # starts tls connection once TCP connection is estabilished
+ def start_tls_connection
+ raise 'SSL Cert file not found' unless File.exist?(Juno.juno_config.ssl_cert_file)
+ raise 'SSL Key file not found' unless File.exist?(Juno.juno_config.ssl_key_file)
+
+ @channel.start_tls(
+ private_key_file: Juno.juno_config.ssl_key_file, cert: File.read(Juno.juno_config.ssl_cert_file)
+ )
+ # Timer to check if SSL Handshake was successful
+ EventMachine::Timer.new(Juno.juno_config.max_connection_timeout.to_f / 1000) do
+ if @ssl_connected.false?
+ puts 'SLL Handshake timeout'
+ close_connection
+ end
+ end
+ end
+
+ # Method called when TCP connection estabilished. If useSSL is true, it is called after a successfull ssl handshake
+ def on_connection_completed
+ # puts "completed #{Time.now}"
+ end
+
+ # method to check if channel is connected
+ def is_connected?
+ if use_ssl?
+ return false if @ssl_connected.false?
+ elsif @connected.false?
+ return false
+ end
+
+ # get ip and port of server
+ # Socket.unpack_sockaddr_in(@channel.get_peername)
+ true
+ rescue Exception => e
+ @LOGGER.error(@PROG_NAME) { e.message }
+ false
+ end
+
+ def use_ssl?
+ Juno.juno_config.use_ssl
+ end
+
+ def use_ltm?
+ Juno.juno_config.bypass_ltm
+ end
+
+ # method called by EventMachine when data is received from server
+ # @param data [String] - byte data received from server
+ def receive_data(data)
+ @@recv_count.increment
+ # puts @@recv_count
+
+ EventMachine.defer do
+ operation_message = Juno::IO::OperationMessage.new
+ operation_message.read(StringIO.new(data))
+ @io_processor.put_response(operation_message)
+ end
+ end
+
+ # Called by EventMachine after TCP Connection estabilished
+ def connection_completed
+ @connected.value = true
+ on_connection_completed unless use_ssl?
+ end
+
+ # Called by EventMachine after connection disconnected
+ # @param m - Error if disconnected due to an error
+ def unbind(error)
+ @connected.value = false
+ @ssl_connected.value = false
+ puts error unless error.nil?
+ end
+
+ # Called by EventMachine after ssl handshake
+ def ssl_handshake_completed
+ @ssl_connected.value = true
+ on_connection_completed if use_ssl?
+
+ # puts get_cipher_name
+ # puts get_cipher_protocol
+ @server_handshake_completed = true
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/io_processor.rb b/client/Ruby/juno/lib/juno/Net/io_processor.rb
new file mode 100644
index 00000000..436fc9b4
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/io_processor.rb
@@ -0,0 +1,211 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+module Juno
+ module Net
+ # Module to handle connections to server, reading/writing requests from request queue
+ class IOProcessor < BaseProcessor
+ INITIAL_BYPASSLTM_RETRY_INTERVAL = 337_500
+ MAX_BYPASSLTM_RETRY_INTERVAL = 86_400_000
+ INIT_WAIT_TIME = 200
+ MAX_WAIT_TIME = 60_000
+ # class variable to count messages sent using send_data
+ @@counter = Concurrent::AtomicFixnum.new(0)
+ def self.send_count
+ @@counter.value
+ end
+
+ # @param request_queue [Juno::Net::RequestQueue]
+ # @param opaque_resp_queue_map [Concurrent::Map] - map containing opaque as key and value as Response queue corresponding to opaque
+ def initialize(request_queue, opaque_resp_queue_map)
+ super()
+ @PROG_NAME = self.class.name
+ @LOGGER = Juno::Logger.instance
+ @stop = false
+ @request_queue = request_queue
+ @opaque_resp_queue_map = opaque_resp_queue_map
+ @ctx = nil ## changed
+ @handshake_failed_attempts = 0
+ @reconnect_wait_time = INIT_WAIT_TIME
+ @shift = 5 # seconds
+ @next_bypass_ltm_check_time = Time.now
+ @bypass_ltm_retry_interval = INITIAL_BYPASSLTM_RETRY_INTERVAL
+ # @config = config
+ @channel = nil
+ @next_reconnect_due = Float::INFINITY
+ end
+
+ def connection_lifetime
+ Juno.juno_config.connection_lifetime
+ end
+
+ def put_response(operation_message)
+ return if operation_message.nil?
+
+ unless Juno::Net::PingMessage.ping_response?(operation_message, self)
+ opaque = operation_message&.protocol_header&.opaque
+ return if opaque.nil?
+
+ resp_queue = @opaque_resp_queue_map.get_and_set(opaque.to_i, nil)
+ if !resp_queue.nil?
+ begin
+ resp_queue.push(operation_message)
+ rescue ThreadError
+ @LOGGER.debug(@PROG_NAME) { "response queue for #{opaque.to_i} is full" }
+ end
+ else
+ @LOGGER.debug(@PROG_NAME) { "resp_queue nil for #{opaque.to_i}" }
+ end
+ end
+ nil
+ end
+
+ def disconnect_channel(channel)
+ EventMachine::Timer.new(2 * Juno.juno_config.max_response_timeout.to_f / 1000) do
+ channel&.close_connection_after_writing if !channel.nil? && channel.is_connected?
+ end
+ end
+
+ def set_recycle_timer
+ @recycle_timer = EventMachine::Timer.new(Juno.juno_config.connection_lifetime.to_f / 1000) do
+ juno_connect(true)
+ end
+ end
+
+ def initiate_bypass_ltm
+ send_ping_message
+ EventMachine::Timer.new(Juno.juno_config.response_timeout.to_f / 1000) do
+ ip = ping_ip
+ unless ip.nil?
+ new_channel = EventMachine.connect(ip.to_s, Juno.juno_config.port, ClientHandler, self)
+ EventMachine::Timer.new(Juno.juno_config.connection_timeout.to_f / 1000) do
+ if new_channel.is_connected?
+ @LOGGER.info(@PROG_NAME) { "conncected to Proxy #{ip}:#{Juno.juno_config.port} " }
+ old_channel = @channel
+ @channel = new_channel
+ disconnect_channel(old_channel)
+ else
+ @LOGGER.info(@PROG_NAME) { "could not conncect to Proxy #{ip}:#{Juno.juno_config.port} " }
+ end
+ end
+ end
+ end
+ end
+
+ # Sends ping message to LoadBalancer to get ProxyIP
+ # @see Juno::Net::PingMessage
+ def send_ping_message
+ ping_message = Juno::Net::PingMessage.new
+ buff = StringIO.new
+ ping_message.write(buff)
+ request_uuid = ping_message&.operation_message&.metadata_component&.request_uuid.to_s
+ @request_queue.push(buff.string, request_uuid)
+ end
+
+ # Method to handle connections creation, re-attempts on failure, initiates connection refresh and connection to Proxy
+ # @param recycle [Boolean] - True if connection refresh request (optional, default: false)
+ def juno_connect(recycle = false)
+ return if !recycle && !@channel.nil? && @channel.is_connected?
+
+ new_channel = EventMachine.connect(Juno.juno_config.host, Juno.juno_config.port, ClientHandler, self)
+ new_channel.pending_connect_timeout = Juno.juno_config.connection_lifetime
+ EventMachine::Timer.new(Juno.juno_config.connection_timeout.to_f / 1000) do
+ if new_channel.is_connected?
+ @LOGGER.info(@PROG_NAME) { "conncected to #{Juno.juno_config.host}:#{Juno.juno_config.port} " }
+ if recycle
+ old_channel = @channel
+ @channel = new_channel
+ disconnect_channel(old_channel)
+ else
+ @channel = new_channel
+ end
+ initiate_bypass_ltm if use_ltm?
+ set_recycle_timer
+ else
+ @recycle_timer&.cancel
+ new_channel&.close_connection if !new_channel.nil? && new_channel.is_connected?
+ @LOGGER.info(@PROG_NAME) do
+ "Could not conncect to #{Juno.juno_config.host}:#{Juno.juno_config.port}\n Retrying in #{@reconnect_wait_time.to_f / 1000}ms "
+ end
+ EventMachine::Timer.new(@reconnect_wait_time.to_f / 1000) do
+ @reconnect_wait_time *= 2
+ @reconnect_wait_time = MAX_WAIT_TIME if @reconnect_wait_time > MAX_WAIT_TIME
+ @reconnect_wait_time *= (1 + 0.3 * rand)
+ juno_connect(recycle)
+ end
+ end
+ end
+ end
+
+ def stop
+ @stop = true
+ end
+
+ # Event loop to continously check for requests in @request_queue
+ def run
+ EventMachine.run do
+ juno_connect
+ EventMachine.tick_loop do
+ if !@channel.nil? && @channel.is_connected?
+ # key = "19key#{rand(100) + rand(1_000_000)}"
+ item = @request_queue.pop
+ unless item.nil?
+ @@counter.increment
+ @channel.send_data(item.msg_buffer)
+ end
+ end
+ :stop if @stop == true
+ rescue Exception => e
+ @LOGGER.error(@PROG_NAME) do
+ "Error in tick_loop: #{e.message}. Stopping tick_loop"
+ end
+ :stop
+ end.on_stop do
+ @LOGGER.debug(@PROG_NAME) do
+ "tick loop stopped. Stop initiated by client #{@stop}"
+ end
+ reset_connections
+ EventMachine::Timer.new(2 * Juno.juno_config.connection_timeout.to_f / 1000) do
+ EventMachine.stop
+ end
+ end
+ rescue Exception => e
+ @LOGGER.debug(@PROG_NAME) do
+ "EventMachine Fatal Exception #{e.message}"
+ end
+ reset_connections
+ EventMachine.stop
+ end
+ end
+
+ def reset_connections
+ @recycle_timer&.cancel
+ disconnect_channel(@channel)
+ end
+
+ def use_ssl?
+ Juno.juno_config.use_ssl
+ end
+
+ def host
+ Juno.juno_config.host
+ end
+
+ def port
+ Juno.juno_config.port
+ end
+
+ def use_ltm?
+ host != '127.0.0.1' && Juno.juno_config.bypass_ltm # boolean
+ end
+
+ def bypass_ltm_disabled?
+ if Time.now > @next_bypass_ltm_check_time && @bypass_ltm_retry_interval < MAX_BYPASSLTM_RETRY_INTERVAL
+ return false
+ end
+
+ true
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/ping_message.rb b/client/Ruby/juno/lib/juno/Net/ping_message.rb
new file mode 100644
index 00000000..6d060602
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/ping_message.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Juno
+ module Net
+ # Module to Create/Decode Ping messages
+ class PingMessage
+ # Constant Internal app name to check for ping messages
+ JUNO_INTERNAL_APPNAME = 'JunoInternal'
+
+ # method to read the operation message
+ attr_reader :operation_message
+
+ # @param operation_message [Juno::IO::OperationMessage] (optional, default: Juno::Net::PingMessage::JUNO_INTERNAL_APPNAME)
+ # @param opaque [Integer] (optional, default: 0)
+ def initialize(app_name = nil, opaque = 0)
+ @PROG_NAME = self.class.name
+ @LOGGER = Juno::Logger.instance
+ app_name = JUNO_INTERNAL_APPNAME if app_name.to_s.empty?
+
+ meta_data_component = Juno::IO::MetadataComponent.new
+ meta_data_component.set_request_uuid
+ meta_data_component.set_source_info(app_name: app_name, ip: IPAddr.new(Juno::Utils.local_ips[0]), port: 0)
+
+ protocol_header = Juno::IO::ProtocolHeader.new
+ protocol_header.opcode = Juno::IO::ProtocolHeader::OpCodes::Nop
+ protocol_header.opaque = opaque
+
+ @operation_message = Juno::IO::OperationMessage.new
+ @operation_message.metadata_component = meta_data_component
+ @operation_message.protocol_header = protocol_header
+ end
+
+ # method to check if given operation message is a Ping response
+ # Updates ping_ip in processor if it is a ping response
+ # @param operation_message [Juno::IO::OperationMessage] (required)
+ # @param operation_message [Juno::Net::IOProcessor] (required)
+ def self.ping_response?(operation_message, processor)
+ return false unless processor.use_ltm?
+
+ opcode = operation_message&.protocol_header&.opcode
+ raise 'missing protocol header' if opcode.nil?
+ return false if opcode != Juno::IO::ProtocolHeader::OpCodes::Nop
+ return false if operation_message&.metadata_component.nil?
+ return false if operation_message&.metadata_component&.ip.to_s.empty?
+ return false if operation_message&.metadata_component&.app_name != JUNO_INTERNAL_APPNAME
+
+ ping_ip = operation_message.metadata_component.ip.to_s
+ if ping_ip.split('.')[0] == '127'
+ processor.ping_ip = ''
+ return true
+ end
+ if Juno::Utils.local_ips.include?(ping_ip)
+ processor.ping_ip = ''
+ return true
+ end
+ processor.ping_ip = ping_ip
+ true
+ end
+
+ # Function to serialize Component to buffer
+ # @param buff [StringIO] (required)
+ def write(buf)
+ @operation_message.write(buf)
+ end
+
+ # Function to de-serialize Component from buffer
+ # @param buff [StringIO] (required)
+ def read(buf)
+ @operation_message = Juno::IO::OperationMessage.new
+ @operation_message.read(buf)
+ end
+
+ # Function to read the ping ip
+ def ip
+ @operation_message&.metadata_component&.ip
+ end
+
+ # Function to read the port from metadata component
+ def port
+ @operation_message&.metadata_component&.port
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/request_queue.rb b/client/Ruby/juno/lib/juno/Net/request_queue.rb
new file mode 100644
index 00000000..4b62093c
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/request_queue.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Juno
+ module Net
+ # DataType of each item in RequestQueue
+ class QueueEntry
+ attr_accessor :msg_buffer, :req_id, :enqueue_time
+
+ # @param msg_bugger [StringIO] (required)
+ # @param id [String] - request UUID (required)
+ def initialize(msg_buffer, id)
+ @msg_buffer = msg_buffer
+ @req_id = id
+ @enqueue_time = Time.now
+ end
+ end
+
+ # Request queue - Singleton
+ class RequestQueue
+ # mutex to synchronize creation of RequestQueue instance
+ @@mutex = Mutex.new
+
+ # Singleton instance
+ @@instance = nil
+
+ def self.instance
+ return @@instance unless @@instance.nil?
+
+ @@mutex.synchronize do
+ @@instance ||= new
+ end
+ end
+
+ private_class_method :new
+
+ attr_reader :opaque_resp_queue_map
+
+ def initialize
+ @PROG_NAME = self.class.name
+ @LOGGER = Juno::Logger.instance
+ @size = 13_000 # Default request queue size
+ @request_queue = SizedQueue.new(@size)
+ @opaque_resp_queue_map = Concurrent::Map.new
+ @worker_pool = Juno::Net::WorkerPool.new(self)
+ end
+
+ def full?
+ @request_queue.size == @size
+ end
+
+ def size
+ @request_queue.size
+ end
+
+ def stop
+ @worker_pool.stop
+ @request_queue.clear
+ end
+
+ # @param operation_message [Juno::IO::OperatioinMessage] (required)
+ # @return [Boolean] - true if successfully pushed item to queue. Else false
+ def push(msg_buffer, request_uuid)
+ # buffer = StringIO.new
+ # operation_message.write(buffer)
+ # request_uuid = operation_message&.metadata_component&.request_uuid.to_s
+ request_uuid = 'not_set' if request_uuid.to_s.empty?
+
+ begin
+ @request_queue.push(QueueEntry.new(msg_buffer, request_uuid), true)
+ rescue ThreadError
+ return false
+ end
+ true
+ end
+
+ # @return [QueueEntry] - nil if queue empty
+ def pop
+ @request_queue.pop(true)
+ rescue ThreadError
+ # queue empty
+ nil
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Net/worker_pool.rb b/client/Ruby/juno/lib/juno/Net/worker_pool.rb
new file mode 100644
index 00000000..a94c6923
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Net/worker_pool.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Juno
+ module Net
+ class WorkerPool
+ def initialize(request_queue)
+ raise 'Request queue cannot be nil' if request_queue.nil?
+
+ @PROG_NAME = self.class.name
+ @LOGGER = Juno::Logger.instance
+ @request_queue = request_queue
+ EventMachine.threadpool_size = 200
+ @io_processor = Juno::Net::IOProcessor.new(@request_queue, @request_queue.opaque_resp_queue_map)
+ init
+ end
+
+ def init
+ @worker = Thread.new do
+ @io_processor.run
+ end
+ end
+
+ def active?
+ @worker.alive?
+ end
+
+ def stop
+ @io_processor.stop
+ end
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Utils/client_utils.rb b/client/Ruby/juno/lib/juno/Utils/client_utils.rb
new file mode 100644
index 00000000..ae10f05a
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Utils/client_utils.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+module Juno
+ module ClientUtils
+ def self.create_operation_message(juno_message, opaque)
+ protocol_header = Juno::IO::ProtocolHeader.new
+ protocol_header.version = juno_message.version
+ protocol_header.opcode = juno_message.operation_type
+ protocol_header.opaque = opaque
+
+ metadata_component = Juno::IO::MetadataComponent.new
+ if juno_message.time_to_live_s.to_i.positive?
+ metadata_component.set_time_to_live(juno_message.time_to_live_s.to_i)
+ end
+ metadata_component.set_version(juno_message.version)
+
+ if [Juno::IO::JunoMessage::OperationType::CREATE,
+ Juno::IO::JunoMessage::OperationType::SET].include?(juno_message.operation_type)
+ metadata_component.set_creation_time(Time.now.to_i)
+ end
+
+ metadata_component.set_expiration_time((Time.now + juno_message.time_to_live_s).to_i) # what ?
+ metadata_component.set_request_uuid(juno_message.request_uuid)
+ metadata_component.set_source_info(app_name: juno_message.app_name, ip: juno_message.ip, port: juno_message.port)
+ metadata_component.set_originator_request_id # what
+
+ payload_component = Juno::IO::PayloadComponent.new
+ payload_component.namespace = juno_message.namespace
+ payload_component.payload_key = juno_message.key
+ payload_component.set_value(juno_message.value, juno_message.compression_type)
+
+ operation_message = Juno::IO::OperationMessage.new
+ operation_message.protocol_header = protocol_header
+ operation_message.metadata_component = metadata_component
+ operation_message.payload_component = payload_component
+
+ juno_message.message_size = operation_message.size
+
+ operation_message
+ end
+
+ def self.compressed_value(value)
+ compressed_value = Snappy.deflate(value)
+ compression_achieved = 100 - (compressed_value.length * 100) / value.length
+ [compressed_value, compression_achieved]
+ rescue Exception
+ [value, false]
+ end
+
+ def self.decompress_value(value)
+ Snappy.inflate(value)
+ rescue Exception
+ # Log failure
+ value
+ end
+
+ def self.validate!(juno_request)
+ return false unless juno_request.is_a?(Juno::Client::JunoRequest)
+
+ raise ArgumentError, 'Juno request key cannot be empty' if juno_request.key.to_s.nil?
+
+ juno_request.time_to_live_s = Juno.juno_config.default_lifetime unless juno_request.time_to_live_s.to_i.positive?
+
+ if juno_request.time_to_live_s > Juno.juno_config.max_lifetime || juno_request.time_to_live_s.negative?
+ raise ArgumentError,
+ "Record time_to_live_s (#{juno_request.time_to_live_s}s) cannot be greater than #{Juno.juno_config.max_lifetime}s or negative ."
+ end
+
+ if juno_request.key.to_s.size > Juno.juno_config.max_key_size
+ raise ArgumentError,
+ "Key size cannot be greater than #{Juno.juno_config.max_key_size}"
+ end
+
+ if juno_request.key.to_s.size > Juno.juno_config.max_key_size
+ raise ArgumentError,
+ "Key size cannot be greater than #{Juno.juno_config.max_key_size}"
+ end
+
+ juno_message = Juno::IO::JunoMessage.new
+ juno_message.key = juno_request.key
+ juno_message.version = juno_request.version
+ juno_message.operation_type = juno_request.type
+ juno_message.time_to_live_s = juno_request.time_to_live_s
+ juno_message.creation_time = juno_request.creation_time
+ juno_message.namespace = Juno.juno_config.record_namespace
+ juno_message.app_name = Juno.juno_config.app_name
+ juno_message.request_uuid = UUIDTools::UUID.random_create.to_s
+ juno_message.ip = IPAddr.new(Juno::Utils.local_ips[0])
+ juno_message.port = 0
+
+ unless [Juno::Client::JunoRequest::Type::GET,
+ Juno::Client::JunoRequest::Type::DESTROY].include?(juno_request.type)
+ payload_value = juno_request.value
+ is_compressed = false
+ compression_achieved = 0
+ if Juno.juno_config.use_payload_compression && value.length > 1024
+ payload_value, compression_achieved = compressed_value(value)
+ is_compressed = true if compression_achieved.positive?
+ end
+ juno_message.is_compressed = is_compressed
+ juno_message.value = payload_value
+ juno_message.compression_achieved = compression_achieved
+ juno_message.compression_type = is_compressed ? Juno::IO::CompressionType::Snappy : Juno::IO::CompressionType::None
+ end
+
+ juno_message
+ end
+
+ # @params operation_message [Juno::IO::OperationMessage] (required)
+ # @returns [Juno::IO::JunoMessage]
+ def self.decode_operation_message(operation_message)
+ return nil unless operation_message.is_a?(Juno::IO::OperationMessage)
+
+ juno_message = Juno::IO::JunoMessage.new
+ opcode = operation_message.protocol_header.opcode.to_i
+ juno_message.operation_type = Juno::IO::JunoMessage::OperationType.get(opcode)
+
+ server_status = operation_message.protocol_header.status.to_i
+ juno_message.server_status = Juno::ServerStatus.get(server_status)
+
+ juno_message.message_size = operation_message.protocol_header.message_size.to_i
+
+ unless operation_message.metadata_component.nil?
+ metadata_component = operation_message.metadata_component
+ juno_message.time_to_live_s = metadata_component.time_to_live.to_i
+ juno_message.ip = metadata_component.ip
+ juno_message.port = metadata_component.port
+ juno_message.version = metadata_component.version.to_i
+ juno_message.creation_time = metadata_component.creation_time.to_i
+ juno_message.expiration_time = metadata_component.expiration_time.to_i
+ juno_message.request_uuid = metadata_component.request_uuid
+ juno_message.app_name = metadata_component.app_name
+ juno_message.last_modification = metadata_component.last_modification.to_i
+ juno_message.originator_request_id = metadata_component.originator_request_id.to_s
+ juno_message.correlation_id = metadata_component.correlation_id
+ juno_message.request_handling_time = metadata_component.request_handling_time.to_i
+ # juno_message.request_start_time = metadata_component.
+ # expiry
+ end
+
+ unless operation_message.payload_component.nil?
+ juno_message.namespace = operation_message.payload_component.namespace.to_s
+ juno_message.key = operation_message.payload_component.payload_key.to_s
+ juno_message.is_compressed = operation_message.payload_component.compressed?
+ juno_message.compression_type = operation_message.payload_component.compression_type.to_i
+ juno_message.value = if operation_message.payload_component.payload_length.to_i.zero?
+ juno_message.compression_achieved = 0
+ nil
+ elsif juno_message.is_compressed
+ compressed_value = operation_message.payload_component.value.to_s
+ decompressed_value = decompress_value(compressed_value)
+ juno_message.compression_achieved = 100 - (compressed_value.length / decompressed_value.length.to_f) * 100.0
+ decompressed_value
+ else
+ juno_message.compression_achieved = 0
+ operation_message.payload_component.value.to_s
+ end
+ end
+
+ juno_message
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/Utils/utils.rb b/client/Ruby/juno/lib/juno/Utils/utils.rb
new file mode 100644
index 00000000..f9da34d0
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/Utils/utils.rb
@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+module Juno
+ class Utils
+ def self.local_ips
+ ip_addresses = Socket.ip_address_list.select do |addr|
+ addr.ipv4? && !addr.ipv4_loopback? # && !addr.ipv4_private?
+ end
+ ip_addresses.map!(&:ip_address)
+ rescue StandardError => e
+ puts e.message
+ ['127.0.0.1']
+ end
+
+ def self.create_message(key, op_type, value = '')
+ meta_data_component = Juno::IO::MetadataComponent.new
+ # ip = IPAddr.new(Socket.ip_address_list.detect(&:ipv4_private?).ip_address)
+ meta_data_component.set_time_to_live(Juno.juno_config.default_lifetime)
+ meta_data_component.set_version(1)
+ meta_data_component.set_creation_time(1000)
+ meta_data_component.set_request_uuid
+ meta_data_component.set_correlation_id
+ meta_data_component.set_originator_request_id
+ meta_data_component.set_source_info(app_name: Juno.juno_config.app_name, ip: IPAddr.new(Juno::Utils.local_ips[0]),
+ port: Juno.juno_config.port)
+
+ payload_component = Juno::IO::PayloadComponent.new
+ payload_component.namespace = Juno.juno_config.record_namespace
+ payload_component.payload_key = key
+ if op_type == Juno::IO::ProtocolHeader::OpCodes::Create && !value.to_s.empty?
+ is_compressed = false
+ if Juno.juno_config.use_payload_compression && value.length > 1024
+ value, compression_achieved = compressed_value(value)
+ is_compressed = true if compression_achieved.positive?
+ end
+ if is_compressed
+ puts 'using compression'
+ payload_component.set_value(value, Juno::IO::CompressionType::Snappy)
+ else
+ payload_component.set_value(value)
+ end
+ end
+
+ protocol_header = Juno::IO::ProtocolHeader.new
+ protocol_header.opcode = op_type
+
+ operation_message = Juno::IO::OperationMessage.new
+ operation_message.metadata_component = meta_data_component
+ operation_message.protocol_header = protocol_header
+ operation_message.payload_component = payload_component
+ buffer = StringIO.new
+ operation_message.write(buffer)
+ buffer
+ end
+
+ def self.ssl_context
+ ssl_context = OpenSSL::SSL::SSLContext.new
+ ssl_context.ssl_version = :TLSv1_1
+ cert = OpenSSL::X509::Certificate.new(File.open(File.expand_path(File.join(
+ __dir__, '..', '..', 'server.crt'
+ ))))
+ key = OpenSSL::PKey::RSA.new(File.open(File.expand_path(File.join(
+ __dir__, '..', '..', 'server.pem'
+ ))))
+ ca_file = OpenSSL::X509::Certificate.new(File.open(File.expand_path(File.join(
+ __dir__, '..', '..', 'myca.crt'
+ ))))
+ ssl_context.add_certificate(cert, key, [ca_file])
+ # ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+ ssl_context.ssl_timeout = 10
+ ssl_context.timeout = 10
+ ssl_context
+ end
+
+ def self.ssl_request(buffer)
+ socket = TCPSocket.open(Juno.juno_config.host, Juno.juno_config.port)
+ if Juno.juno_config.use_ssl
+ ctx = ssl_context
+ socket = OpenSSL::SSL::SSLSocket.new(socket, ctx)
+ socket.sync_close = true
+ # socket.post_connection_check(Juno.juno_config.host)
+ socket.connect
+ end
+
+ # puts socket.peer_finished_message.bytes.join(', ')
+ # puts socket.verify_result
+
+ socket.write(buffer.string)
+ res_buffer = StringIO.new
+ header = true
+
+ size = 0
+ while (line = socket.sysread(1024 * 16)) # buffer size of OpenSSL library
+ if header
+ p = Juno::IO::ProtocolHeader.new
+ p.read(StringIO.new(line))
+ header = false
+ size = p.message_size
+ end
+ res_buffer.write(line)
+ break if res_buffer.length == size
+ end
+ socket.close
+
+ res_buffer.rewind
+
+ res_buffer
+ end
+
+ def self.create_and_send_ping_message
+ ping_message = Juno::Net::PingMessage.new
+ ping_buffer = StringIO.new
+ ping_message.write(ping_buffer)
+ response = ssl_request(ping_buffer)
+ ping_message = Juno::Net::PingMessage.new
+ ping_message.read(response)
+ ping_message
+ end
+
+ def self.time_diff_ms(a, b)
+ (b - a).abs * 1000
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/logger.rb b/client/Ruby/juno/lib/juno/logger.rb
new file mode 100644
index 00000000..6e0ef7e7
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/logger.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Juno
+ # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+
+ class Logger
+ @@mutex = Mutex.new
+
+ # Singleton instance
+ @@instance = nil
+
+ def self.instance
+ return @@instance unless @@instance.nil?
+
+ @@mutex.synchronize do
+ if @@instance.nil?
+ raise 'log file not configured' if Juno.juno_config.log_file.to_s.empty?
+
+ @@instance = ::Logger.new(Juno.juno_config.log_file, 'daily', progname: 'JunoRubyClient')
+
+ @@instance.level = ::Logger::INFO
+ end
+ end
+ @@instance
+ end
+
+ def self.level=(log_level)
+ @@instance.level = log_level unless @@instance.nil?
+ end
+
+ private_class_method :new
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/server_status.rb b/client/Ruby/juno/lib/juno/server_status.rb
new file mode 100644
index 00000000..a5af05d2
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/server_status.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Juno
+ class ServerStatus
+ SUCCESS = { code: 0, error_msg: 'no error', client_operation_status: Juno::Client::OperationStatus::SUCCESS }.freeze
+ BAD_MSG = { code: 1, error_msg: 'bad message',
+ client_operation_status: Juno::Client::OperationStatus::INTERNAL_ERROR }.freeze
+ NO_KEY = { code: 3, error_msg: 'key not found',
+ client_operation_status: Juno::Client::OperationStatus::NO_KEY }.freeze
+ DUP_KEY = { code: 4, error_msg: 'dup key',
+ client_operation_status: Juno::Client::OperationStatus::UNIQUE_KEY_VIOLATION }.freeze
+ BAD_PARAM = { code: 7, error_msg: 'bad parameter',
+ client_operation_status: Juno::Client::OperationStatus::BAD_PARAM }.freeze
+ RECORD_LOCKED = { code: 8, error_msg: 'record locked',
+ client_operation_status: Juno::Client::OperationStatus::RECORD_LOCKED }.freeze
+ NO_STORAGE_SERVER = { code: 12, error_msg: 'no active storage server',
+ client_operation_status: Juno::Client::OperationStatus::NO_STORAGE }.freeze
+ SERVER_BUSY = { code: 14, error_msg: 'Server busy',
+ client_operation_status: Juno::Client::OperationStatus::INTERNAL_ERROR }.freeze
+ VERSION_CONFLICT = { code: 19, error_msg: 'version conflict',
+ client_operation_status: Juno::Client::OperationStatus::CONDITION_VIOLATION }.freeze
+ OP_STATUS_SS_READ_TTL_EXTENDERR = { code: 23, error_msg: 'Error extending TTL by SS',
+ client_operation_status: Juno::Client::OperationStatus::INTERNAL_ERROR }.freeze
+ COMMIT_FAILURE = { code: 25, error_msg: 'Commit Failure',
+ client_operation_status: Juno::Client::OperationStatus::INTERNAL_ERROR }.freeze
+ INCONSISTENT_STATE = { code: 26, error_msg: 'Inconsistent State',
+ client_operation_status: Juno::Client::OperationStatus::SUCCESS }.freeze
+ INTERNAL = { code: 255, error_msg: 'Internal error',
+ client_operation_status: Juno::Client::OperationStatus::INTERNAL_ERROR }.freeze
+
+ @@status_code_map = nil
+
+ def self.initialize_map
+ @@status_code_map = {}
+
+ constants.each do |const|
+ const_obj = const_get(const)
+ @@status_code_map[const_obj[:code].to_i] = const_obj
+ end
+ end
+
+ def self.get(status_code)
+ initialize_map if @@status_code_map.nil?
+ return @@status_code_map[status_code] if @@status_code_map.key?(status_code.to_i)
+
+ INTERNAL
+ end
+ end
+end
diff --git a/client/Ruby/juno/lib/juno/version.rb b/client/Ruby/juno/lib/juno/version.rb
new file mode 100644
index 00000000..e9bf587c
--- /dev/null
+++ b/client/Ruby/juno/lib/juno/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Juno
+ VERSION = '1.0.0'
+end
diff --git a/client/Ruby/juno/pkg/juno-0.1.0.gem b/client/Ruby/juno/pkg/juno-0.1.0.gem
new file mode 100644
index 00000000..90a4f1c9
Binary files /dev/null and b/client/Ruby/juno/pkg/juno-0.1.0.gem differ
diff --git a/client/Ruby/juno/pkg/juno-1.0.0.gem b/client/Ruby/juno/pkg/juno-1.0.0.gem
new file mode 100644
index 00000000..06f03990
Binary files /dev/null and b/client/Ruby/juno/pkg/juno-1.0.0.gem differ
diff --git a/client/Ruby/juno/spec/Client/sync_client.rb b/client/Ruby/juno/spec/Client/sync_client.rb
new file mode 100644
index 00000000..aaf3846c
--- /dev/null
+++ b/client/Ruby/juno/spec/Client/sync_client.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'juno'
+
+describe 'Sync client tests' do
+ before(:context) do
+ Juno.configure do |config|
+ config.file_path = URI.join('file:///', File.expand_path('./../../../juno.yml').to_s)
+ config.log_file = 'juno.log'
+ config.ssl_cert_file = File.expand_path('./../../lib/server.crt')
+ config.ssl_key_file = File.expand_path('./../../lib/server.pem')
+ end
+
+ @juno_client = Juno::Client::SyncClient.new
+ @key = "mykey#{rand(1000)}"
+ @value = 'myvalue'
+ end
+
+ it 'create test' do
+ juno_resp = @juno_client.create(@key, @value, ttl: 12_000)
+ expect(juno_resp.status[:code]).to eq(Juno::ServerStatus::SUCCESS[:code])
+ expect(juno_resp.record_context.time_to_live_s).to eq(12_000)
+ end
+
+ it 'get request test' do
+ juno_resp = @juno_client.get(@key)
+ expect(juno_resp.status[:code]).to eq(Juno::ServerStatus::SUCCESS[:code])
+ expect(juno_resp.value).to eq(@value)
+ expect(juno_resp.record_context.version).to eq(1)
+ end
+
+ it 'update request test' do
+ juno_resp = @juno_client.update(@key, 'newvalue')
+ @record_context = juno_resp.record_context
+ expect(juno_resp.status[:code]).to eq(Juno::ServerStatus::SUCCESS[:code])
+ expect(juno_resp.value).to eq(@value)
+ expect(juno_resp.record_context.version).to eq(1)
+ end
+
+ it 'compare_and_set request test' do
+ juno_resp = @juno_client.compare_and_set(@record_context, 'value99')
+ expect(juno_resp.status[:code]).to eq(Juno::ServerStatus::SUCCESS[:code])
+ expect(juno_resp.value).to eq(@value)
+ expect(juno_resp.record_context.version).to eq(1)
+ end
+end
diff --git a/client/Ruby/juno/spec/IO/metadata_component.rb b/client/Ruby/juno/spec/IO/metadata_component.rb
new file mode 100644
index 00000000..16f40803
--- /dev/null
+++ b/client/Ruby/juno/spec/IO/metadata_component.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require 'bindata'
+require_relative '../../lib/juno/IO/constants'
+require_relative '../../lib/juno/IO/MetadataComponentTemplate'
+require_relative '../../lib/juno/IO/MetadataComponent'
+
+describe 'Juno::IO::PayloadComponent buffer write' do
+ before(:context) do
+ @payload = Juno::IO::MetadataComponent.new
+ @NAMESPACE = 'testnamespace123'
+ @KEY = 'testkey123'
+ @VALUE = 'testvalue456'
+
+ @payload.payload_key = @KEY # length: 10
+ @payload.namespace = @NAMESPACE # length: 16
+ @payload.set_value(@VALUE) # length: 12
+ # size = 13 + 10 + 16 + 12 + 5 = 56
+ buff = StringIO.new
+ @payload.write(buff)
+
+ @bytes_arr = buff.string.bytes
+ end
+
+ it 'component size should be 56' do
+ expect(@bytes_arr.length).to eq(56)
+ size = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(@payload.component_size).to eq(56)
+ expect(size).to eq(56)
+ end
+
+ it 'tag_id should be 1' do
+ expect(@payload.tag_id).to eq(1)
+ expect(@bytes_arr.shift).to eq(1)
+ end
+
+ it 'namspace_length should be 16' do
+ expect(@payload.namespace_length).to eq(16)
+ expect(@bytes_arr.shift).to eq(16)
+ end
+
+ it 'key_length should be 10' do
+ key_length = @bytes_arr.shift(2).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT16)
+ expect(@payload.key_length).to eq(10)
+ expect(key_length).to eq(10)
+ end
+
+ it 'payload_length should be 13' do
+ payload_length = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(@payload.payload_length).to eq(13)
+ expect(payload_length).to eq(13)
+ end
+
+ it 'namespace as expected' do
+ namespace = @bytes_arr.shift(@NAMESPACE.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.namespace).to eq(@NAMESPACE)
+ expect(namespace).to eq(@NAMESPACE)
+ end
+
+ it 'key as expected' do
+ key = @bytes_arr.shift(@KEY.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.payload_key).to eq(@KEY)
+ expect(key).to eq(@KEY)
+ end
+
+ it 'payload_type should be Juno::IO::PayloadType::UnCompressed' do
+ ptype = @bytes_arr.shift
+ expect(@payload.payload_type).to eq(Juno::IO::PayloadType::UnCompressed)
+ expect(ptype).to eq(Juno::IO::PayloadType::UnCompressed)
+ end
+
+ it 'payload value expected' do
+ value = @bytes_arr.shift(@VALUE.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.value).to eq(@VALUE)
+ expect(value).to eq(@VALUE)
+ end
+
+ it 'payload length' do
+ padding = @bytes_arr.shift(5).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(padding.length).to eq(5)
+ expect(@payload.padding.length).to eq(5)
+ expect(padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ expect(@payload.padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ end
+end
+
+describe 'Juno::IO::PayloadComponent buffer read' do
+ before(:context) do
+ @payload = Juno::IO::PayloadComponent.new
+ @NAMESPACE = 'testnamespace123' # length: 16
+ @KEY = 'testkey123' # length: 10
+ @VALUE = 'testvalue456' # length: 12
+
+ # size = 13 + 10 + 16 + 12 + 5 = 56
+ buff = StringIO.new("\x00\x00\x008\x01\x10\x00\n\x00\x00\x00\rtestnamespace123testkey123\x00testvalue456\x00\x00\x00\x00\x00")
+ @payload.read(buff)
+ end
+
+ it 'component size should be 56' do
+ expect(@payload.component_size).to eq(56)
+ end
+
+ it 'tag_id should be 1' do
+ expect(@payload.tag_id).to eq(1)
+ end
+
+ it 'namspace_length should be 16' do
+ expect(@payload.namespace_length).to eq(16)
+ end
+
+ it 'key_length should be 10' do
+ expect(@payload.key_length).to eq(10)
+ end
+
+ it 'payload_length should be 13' do
+ expect(@payload.payload_length).to eq(13)
+ end
+
+ it 'namespace as expected' do
+ expect(@payload.namespace).to eq(@NAMESPACE)
+ end
+
+ it 'key as expected' do
+ expect(@payload.payload_key).to eq(@KEY)
+ end
+
+ it 'payload_type should be Juno::IO::PayloadType::UnCompressed' do
+ expect(@payload.payload_type).to eq(Juno::IO::PayloadType::UnCompressed)
+ end
+
+ it 'payload value expected' do
+ expect(@payload.value).to eq(@VALUE)
+ end
+
+ it 'payload length' do
+ expect(@payload.padding.length).to eq(5)
+ expect(@payload.padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ end
+end
diff --git a/client/Ruby/juno/spec/IO/payload_component_spec.rb b/client/Ruby/juno/spec/IO/payload_component_spec.rb
new file mode 100644
index 00000000..d064f783
--- /dev/null
+++ b/client/Ruby/juno/spec/IO/payload_component_spec.rb
@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+require 'juno'
+
+describe 'Juno::IO::PayloadComponent buffer write' do
+ before(:context) do
+ @payload = Juno::IO::PayloadComponent.new
+ @NAMESPACE = 'testnamespace123'
+ @KEY = 'testkey123'
+ @VALUE = 'testvalue456'
+
+ @payload.payload_key = @KEY # length: 10
+ @payload.namespace = @NAMESPACE # length: 16
+ @payload.set_value(@VALUE) # length: 12
+ # size = 13 + 10 + 16 + 12 + 5 = 56
+ buff = StringIO.new
+ @payload.write(buff)
+
+ @bytes_arr = buff.string.bytes
+ end
+
+ it 'component size should be 56' do
+ expect(@bytes_arr.length).to eq(56)
+ size = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(@payload.component_size).to eq(56)
+ expect(size).to eq(56)
+ end
+
+ it 'tag_id should be 1' do
+ expect(@payload.tag_id).to eq(1)
+ expect(@bytes_arr.shift).to eq(1)
+ end
+
+ it 'namspace_length should be 16' do
+ expect(@payload.namespace_length).to eq(16)
+ expect(@bytes_arr.shift).to eq(16)
+ end
+
+ it 'key_length should be 10' do
+ key_length = @bytes_arr.shift(2).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT16)
+ expect(@payload.key_length).to eq(10)
+ expect(key_length).to eq(10)
+ end
+
+ it 'payload_length should be 13' do
+ payload_length = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(@payload.payload_length).to eq(13)
+ expect(payload_length).to eq(13)
+ end
+
+ it 'namespace as expected' do
+ namespace = @bytes_arr.shift(@NAMESPACE.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.namespace).to eq(@NAMESPACE)
+ expect(namespace).to eq(@NAMESPACE)
+ end
+
+ it 'key as expected' do
+ key = @bytes_arr.shift(@KEY.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.payload_key).to eq(@KEY)
+ expect(key).to eq(@KEY)
+ end
+
+ it 'payload_type should be Juno::IO::PayloadType::UnCompressed' do
+ ptype = @bytes_arr.shift
+ expect(@payload.payload_type).to eq(Juno::IO::PayloadType::UnCompressed)
+ expect(ptype).to eq(Juno::IO::PayloadType::UnCompressed)
+ end
+
+ it 'payload value expected' do
+ value = @bytes_arr.shift(@VALUE.length).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(@payload.value).to eq(@VALUE)
+ expect(value).to eq(@VALUE)
+ end
+
+ it 'payload length' do
+ padding = @bytes_arr.shift(5).pack(Juno::IO::OffsetWidth.UINT8('*'))
+ expect(padding.length).to eq(5)
+ expect(@payload.padding.length).to eq(5)
+ expect(padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ expect(@payload.padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ end
+end
+
+describe 'Juno::IO::PayloadComponent buffer read' do
+ before(:context) do
+ @payload = Juno::IO::PayloadComponent.new
+ @NAMESPACE = 'testnamespace123' # length: 16
+ @KEY = 'testkey123' # length: 10
+ @VALUE = 'testvalue456' # length: 12
+
+ # size = 13 + 10 + 16 + 12 + 5 = 56
+ buff = StringIO.new("\x00\x00\x008\x01\x10\x00\n\x00\x00\x00\rtestnamespace123testkey123\x00testvalue456\x00\x00\x00\x00\x00")
+ @payload.read(buff)
+ end
+
+ it 'component size should be 56' do
+ expect(@payload.component_size).to eq(56)
+ end
+
+ it 'tag_id should be 1' do
+ expect(@payload.tag_id).to eq(1)
+ end
+
+ it 'namspace_length should be 16' do
+ expect(@payload.namespace_length).to eq(16)
+ end
+
+ it 'key_length should be 10' do
+ expect(@payload.key_length).to eq(10)
+ end
+
+ it 'payload_length should be 13' do
+ expect(@payload.payload_length).to eq(13)
+ end
+
+ it 'namespace as expected' do
+ expect(@payload.namespace).to eq(@NAMESPACE)
+ end
+
+ it 'key as expected' do
+ expect(@payload.payload_key).to eq(@KEY)
+ end
+
+ it 'payload_type should be Juno::IO::PayloadType::UnCompressed' do
+ expect(@payload.payload_type).to eq(Juno::IO::PayloadType::UnCompressed)
+ end
+
+ it 'payload value expected' do
+ expect(@payload.value).to eq(@VALUE)
+ end
+
+ it 'payload length' do
+ expect(@payload.padding.length).to eq(5)
+ expect(@payload.padding).to eq([0, 0, 0, 0, 0].pack(Juno::IO::OffsetWidth.UINT8('*')))
+ end
+end
diff --git a/client/Ruby/juno/spec/IO/protocol_header_spec.rb b/client/Ruby/juno/spec/IO/protocol_header_spec.rb
new file mode 100644
index 00000000..b64a02e0
--- /dev/null
+++ b/client/Ruby/juno/spec/IO/protocol_header_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'juno'
+
+describe 'Juno::IO::ProtocolHeader buffer write' do
+ before(:context) do
+ @header = Juno::IO::ProtocolHeader.new
+ @header.message_size = 16
+ @header.opaque = 12
+ buff = StringIO.new
+ @header.write(buff)
+ @bytes_arr = buff.string.bytes
+ end
+
+ it 'number of bytes should be 16' do
+ expect(@bytes_arr.size).to eq(16)
+ end
+
+ it 'magic should be 0x5050' do
+ magic = @bytes_arr.shift(2).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT16)
+ expect(magic).to eq(0x5050)
+ expect(@header.magic).to eq(0x5050)
+ end
+
+ it 'version should be 1' do
+ expect(@bytes_arr.shift).to eq(1)
+ end
+
+ # by default it is an operation message and RequestType is a TwoWayRequest
+ it 'message_type_flag should be 64' do
+ expect(@bytes_arr.shift).to eq(64)
+ end
+
+ it 'message_size should be 16' do
+ message_size = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(message_size).to eq(16)
+ expect(@header.message_size).to eq(16)
+ end
+
+ it 'opaque should be 12' do
+ opaque = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT32)
+ expect(opaque).to eq(12)
+ expect(@header.opaque).to eq(12)
+ end
+
+ it 'opcode should be 0' do
+ expect(@bytes_arr.shift).to eq(Juno::IO::ProtocolHeader::OpCodes::Nop)
+ expect(@header.opcode).to eq(Juno::IO::ProtocolHeader::OpCodes::Nop)
+ end
+
+ it 'flag should be 0' do
+ expect(@bytes_arr.shift).to eq(0)
+ expect(@header.flag).to eq(0)
+ end
+
+ it 'shard_id should be 0' do
+ shard_id = @bytes_arr.shift(4).pack(Juno::IO::OffsetWidth.UINT8('*')).unpack1(Juno::IO::OffsetWidth.UINT16)
+ expect(shard_id).to eq(0)
+ expect(@header.shard_id).to eq(0)
+ end
+end
+
+describe 'Juno::IO::ProtocolHeader buffer read' do
+ before do
+ @header = Juno::IO::ProtocolHeader.new
+ buff = StringIO.new("PP\x01@\x00\x00\x00\x10\x00\x00\x00\f\x00\x00\x00\x00")
+ @header.read(buff)
+ end
+
+ it 'number of bytes should be 16' do
+ expect(@header.message_size).to eq(16)
+ end
+
+ it 'magic should be 0x5050' do
+ expect(@header.magic).to eq(0x5050)
+ end
+
+ it 'version should be 1' do
+ expect(@header.version).to eq(1)
+ end
+
+ # by default it is an operation message and RequestType is a TwoWayRequest
+ it 'message_type_flag should be 64' do
+ expect(@header.message_type_flag.message_request_type).to eq(Juno::IO::ProtocolHeader::RequestTypes::TwoWayRequest)
+ expect(@header.message_type_flag.message_type).to eq(Juno::IO::ProtocolHeader::MessageTypes::OperationalMessage)
+ end
+
+ it 'message_size should be 16' do
+ expect(@header.message_size).to eq(16)
+ end
+
+ it 'opaque should be 12' do
+ expect(@header.opaque).to eq(12)
+ end
+
+ it 'opcode should be 0' do
+ expect(@header.opcode).to eq(Juno::IO::ProtocolHeader::OpCodes::Nop)
+ end
+
+ it 'flag should be 0' do
+ expect(@header.flag).to eq(Juno::IO::ProtocolHeader::OpCodes::Nop)
+ end
+
+ it 'shard_id should be 0' do
+ expect(@header.shard_id).to eq(0)
+ end
+end
diff --git a/client/Ruby/juno/spec/spec_helper.rb b/client/Ruby/juno/spec/spec_helper.rb
new file mode 100644
index 00000000..253df0f1
--- /dev/null
+++ b/client/Ruby/juno/spec/spec_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+ config.expect_with :rspec do |expectations|
+ expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+ end
+
+ config.mock_with :rspec do |mocks|
+ mocks.verify_partial_doubles = true
+ end
+ config.shared_context_metadata_behavior = :apply_to_host_groups
+end
diff --git a/client/Ruby/sample.rb b/client/Ruby/sample.rb
new file mode 100644
index 00000000..09e4125f
--- /dev/null
+++ b/client/Ruby/sample.rb
@@ -0,0 +1,41 @@
+require 'juno'
+
+Juno.configure do |config|
+ config.file_path = URI.join('file:///', '')
+ config.log_file = ''
+ config.ssl_cert_file = ''
+ config.ssl_key_file = ''
+end
+
+# Rails cache store
+juno_client = Juno::Client::CacheStore.new
+juno_client.write('key', 'value')
+
+# Synchronous Client
+juno_client = Juno::Client::SyncClient.new
+resp = juno_client.create('key', 'value')
+resp = juno_client.get('key')
+resp = juno_client.update('key', 'newvalue')
+
+
+# Return Juno::Client::JunoResponse
+resp = juno_client.create('15', '99')
+resp = juno_client.get('15')
+resp = juno_client.update('15', '100')
+
+
+# Asyn Client
+class Callback
+ def update(time, value, reason)
+ puts time
+ if reason.to_s.empty?
+ puts value
+ else
+ puts "failed: #{reason}"
+ end
+ end
+end
+
+juno_client = Juno::Client::ReactClient.new
+juno_client.create('mykey', 'myvalue')
+juno_client.add_observer(Callback.new)
diff --git a/cmd/clustermgr/clusterctl/clusterctl.go b/cmd/clustermgr/clusterctl/clusterctl.go
index 24a3d289..7d2f17be 100644
--- a/cmd/clustermgr/clusterctl/clusterctl.go
+++ b/cmd/clustermgr/clusterctl/clusterctl.go
@@ -28,11 +28,11 @@ import (
"path/filepath"
"strings"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/version"
- "juno/cmd/clustermgr/cmd"
+ "github.com/paypal/junodb/cmd/clustermgr/cmd"
)
//
@@ -64,7 +64,7 @@ func main() {
flag.StringVar(&flagScale, "scale", "", "n:n:n:n:n")
flag.BoolVar(&flagVerbose, "verbose", false, "verbose -- print more info")
- flag.StringVar(&flagCmd, "cmd", "", "command -- store, redist, redistserv")
+ flag.StringVar(&flagCmd, "cmd", "", "command -- store, redist, redistserv, zonemarkdown")
flag.StringVar(&flagType, "type", "cluster_info", "type -- cluster_info, auto, abort")
flag.IntVar(&flagZoneid, "zone", -1, "specify zone id")
@@ -173,5 +173,5 @@ func printUsage() {
fmt.Printf("\nAbort redist: ./%s --cmd redist --type abort\n", progName)
fmt.Printf("redist resume: ./%s --cmd redist --type resume --zone [n] --ratelimit 10000 (optional, in kb)\n", progName)
- fmt.Printf("Zone markdown: ./%s --cmd markdown --type set/get/delete --zone [n] (--zone -1 disables markdwon)\n", progName)
+ fmt.Printf("Zone markdown: ./%s --cmd zonemarkdown --type set/get/delete --zone [n] (--zone -1 disables markdwon)\n", progName)
}
diff --git a/cmd/clustermgr/clustermgr.go b/cmd/clustermgr/clustermgr.go
index 4bc94f1f..6ccba001 100644
--- a/cmd/clustermgr/clustermgr.go
+++ b/cmd/clustermgr/clustermgr.go
@@ -27,11 +27,11 @@ import (
"os"
"path/filepath"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/version"
- "juno/cmd/clustermgr/cmd"
+ "github.com/paypal/junodb/cmd/clustermgr/cmd"
)
var (
@@ -59,7 +59,7 @@ func main() {
flag.StringVar(&flagConfigNew, "new_config", "", "new configfile")
flag.BoolVar(&flagDryrun, "dryrun", false, "dry run -- do not save to etcd")
flag.BoolVar(&flagVerbose, "verbose", false, "verbose -- print more info")
- flag.StringVar(&flagCmd, "cmd", "", "command -- store, redist")
+ flag.StringVar(&flagCmd, "cmd", "", "command -- store, redist, redistserv, zonemarkdown")
flag.StringVar(&flagType, "type", "cluster_info", "type -- cluster_info, auto, abort")
flag.IntVar(&flagZoneid, "zone", -1, "specify zone id")
flag.IntVar(&flagSkipZone, "skipzone", -1, "specify zone id to skip")
@@ -180,5 +180,5 @@ func printUsage() {
fmt.Printf("Dump redist start_src to stdout: ./%s --new_config redist.toml --cmd redist --type start_src --zone [n] --dryrun --automarkdown=false\n", progName)
fmt.Printf("Dump redist commit to stdout: ./%s --new_config redist.toml --cmd redist --type commit --dryrun\n", progName)
fmt.Printf("Dump redist resume: ./%s --new_config redist.toml --cmd redist --type resume --zone [n] --ratelimit 10000 (optional, in kb)\n", progName)
- fmt.Printf("Zone markdown: ./%s --config config.toml --cmd markdown --type set/get/delete --zone [n] (--zone -1 disables markdwon)\n", progName)
+ fmt.Printf("Zone markdown: ./%s --config config.toml --cmd zonemarkdown --type set/get/delete --zone [n] (--zone -1 disables markdwon)\n", progName)
}
diff --git a/cmd/clustermgr/cmd/cmd.go b/cmd/clustermgr/cmd/cmd.go
index f9fce42f..f684f9fa 100644
--- a/cmd/clustermgr/cmd/cmd.go
+++ b/cmd/clustermgr/cmd/cmd.go
@@ -27,10 +27,10 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
)
func GetStatus(configFile string) {
diff --git a/cmd/clustermgr/cmd/config.go b/cmd/clustermgr/cmd/config.go
index 8d67d49a..4089b994 100644
--- a/cmd/clustermgr/cmd/config.go
+++ b/cmd/clustermgr/cmd/config.go
@@ -26,10 +26,10 @@ import (
"github.com/BurntSushi/toml"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
)
var (
diff --git a/cmd/dbscanserv/app/cmd.go b/cmd/dbscanserv/app/cmd.go
index a642a978..59b3beeb 100644
--- a/cmd/dbscanserv/app/cmd.go
+++ b/cmd/dbscanserv/app/cmd.go
@@ -28,12 +28,12 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/dbscanserv/prime"
- "juno/cmd/storageserv/compact"
- "juno/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/cmd/storageserv/compact"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
)
type CmdLine struct {
diff --git a/cmd/dbscanserv/app/collect.go b/cmd/dbscanserv/app/collect.go
index 5d8a49d9..7cd2f358 100644
--- a/cmd/dbscanserv/app/collect.go
+++ b/cmd/dbscanserv/app/collect.go
@@ -25,10 +25,10 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/dbscanserv/prime"
- "juno/pkg/logging"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/pkg/logging"
)
type Collector struct {
diff --git a/cmd/dbscanserv/app/init.go b/cmd/dbscanserv/app/init.go
index d81a98c8..1feb7864 100644
--- a/cmd/dbscanserv/app/init.go
+++ b/cmd/dbscanserv/app/init.go
@@ -27,15 +27,15 @@ import (
"github.com/BurntSushi/toml"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/clustermgr/cmd"
- "juno/cmd/dbscanserv/config"
- "juno/cmd/dbscanserv/prime"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/sec"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/clustermgr/cmd"
+ "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/sec"
)
type CmdConfig cmd.Config
diff --git a/cmd/dbscanserv/app/patch.go b/cmd/dbscanserv/app/patch.go
index 70bf2e93..d1f8acbe 100644
--- a/cmd/dbscanserv/app/patch.go
+++ b/cmd/dbscanserv/app/patch.go
@@ -27,14 +27,14 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
-
- "juno/cmd/dbscanserv/config"
- "juno/cmd/dbscanserv/prime"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
+
+ "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type CmdUpdatePatch struct {
diff --git a/cmd/dbscanserv/app/remote.go b/cmd/dbscanserv/app/remote.go
index 46d4ca4d..b6aa6f8f 100644
--- a/cmd/dbscanserv/app/remote.go
+++ b/cmd/dbscanserv/app/remote.go
@@ -30,11 +30,11 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/dbscanserv/config"
- "juno/cmd/dbscanserv/prime"
- "juno/pkg/net/netutil"
+ "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/pkg/net/netutil"
)
type Remote int
diff --git a/cmd/dbscanserv/app/rpcclient.go b/cmd/dbscanserv/app/rpcclient.go
index e468557e..b02449fd 100644
--- a/cmd/dbscanserv/app/rpcclient.go
+++ b/cmd/dbscanserv/app/rpcclient.go
@@ -27,10 +27,10 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/dbscanserv/config"
- "juno/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
)
type RpcClient struct {
diff --git a/cmd/dbscanserv/app/scan.go b/cmd/dbscanserv/app/scan.go
index 331a63d4..0321514f 100644
--- a/cmd/dbscanserv/app/scan.go
+++ b/cmd/dbscanserv/app/scan.go
@@ -24,11 +24,11 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/dbscanserv/prime"
- "juno/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
)
// Map from zoneid, shardid to Scanner
diff --git a/cmd/dbscanserv/junoctl/junoctl.go b/cmd/dbscanserv/junoctl/junoctl.go
index c03045c3..2d6894fe 100644
--- a/cmd/dbscanserv/junoctl/junoctl.go
+++ b/cmd/dbscanserv/junoctl/junoctl.go
@@ -25,9 +25,9 @@ import (
"os"
"path/filepath"
- "juno/cmd/dbscanserv/app"
- "juno/pkg/version"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/cmd/dbscanserv/app"
+ "github.com/paypal/junodb/pkg/version"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func main() {
diff --git a/cmd/dbscanserv/main.go b/cmd/dbscanserv/main.go
index de9fe60a..1a8461ff 100644
--- a/cmd/dbscanserv/main.go
+++ b/cmd/dbscanserv/main.go
@@ -27,11 +27,11 @@ import (
"strconv"
"strings"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/dbscanserv/app"
- "juno/cmd/dbscanserv/prime"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/dbscanserv/app"
+ "github.com/paypal/junodb/cmd/dbscanserv/prime"
+ "github.com/paypal/junodb/pkg/version"
)
func parseKeyRange(keyRange string, cmd string) (start int, stop int, skip int) {
diff --git a/cmd/dbscanserv/patch/relay.go b/cmd/dbscanserv/patch/relay.go
index a3014f34..8c73a2ab 100644
--- a/cmd/dbscanserv/patch/relay.go
+++ b/cmd/dbscanserv/patch/relay.go
@@ -22,12 +22,12 @@ package patch
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/dbscanserv/app"
- "juno/cmd/dbscanserv/config"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/cmd/dbscanserv/app"
+ "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/proto"
)
// Called by storageserv.
diff --git a/cmd/dbscanserv/prime/db.go b/cmd/dbscanserv/prime/db.go
index 5e240a5f..42719e01 100644
--- a/cmd/dbscanserv/prime/db.go
+++ b/cmd/dbscanserv/prime/db.go
@@ -26,10 +26,10 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
)
// Map from zoneid, nodeid to db handle
diff --git a/cmd/dbscanserv/prime/log.go b/cmd/dbscanserv/prime/log.go
index 6cf9312c..efb1de63 100644
--- a/cmd/dbscanserv/prime/log.go
+++ b/cmd/dbscanserv/prime/log.go
@@ -23,7 +23,7 @@ import (
"fmt"
"os"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/cmd/dbscanserv/prime/meta.go b/cmd/dbscanserv/prime/meta.go
index b1036384..61d752b8 100644
--- a/cmd/dbscanserv/prime/meta.go
+++ b/cmd/dbscanserv/prime/meta.go
@@ -28,9 +28,9 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
)
type Meta struct {
diff --git a/cmd/dbscanserv/prime/opdata.go b/cmd/dbscanserv/prime/opdata.go
index 58e198b8..20176e6e 100644
--- a/cmd/dbscanserv/prime/opdata.go
+++ b/cmd/dbscanserv/prime/opdata.go
@@ -26,10 +26,10 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/proto"
)
type OpRecord struct {
diff --git a/cmd/dbscanserv/prime/replicate.go b/cmd/dbscanserv/prime/replicate.go
index abde2776..2a4d392c 100644
--- a/cmd/dbscanserv/prime/replicate.go
+++ b/cmd/dbscanserv/prime/replicate.go
@@ -24,12 +24,12 @@ import (
"runtime"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/internal/cli"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/sec"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/sec"
)
var (
diff --git a/cmd/dbscanserv/prime/result.go b/cmd/dbscanserv/prime/result.go
index d68b9251..9e589903 100644
--- a/cmd/dbscanserv/prime/result.go
+++ b/cmd/dbscanserv/prime/result.go
@@ -23,10 +23,10 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/util"
)
type KeyList struct {
diff --git a/cmd/etcdsvr/etcdsvr.py b/cmd/etcdsvr/etcdsvr.py
index 31b46b1d..b4b6dc49 100755
--- a/cmd/etcdsvr/etcdsvr.py
+++ b/cmd/etcdsvr/etcdsvr.py
@@ -24,6 +24,7 @@
import logging
import os
import random
+import shlex
import signal
import socket
import subprocess
@@ -62,13 +63,27 @@ def ip_in_use(ip, port):
s.close()
return True
- except socket.error as e:
+ except socket.error:
pass
- except Exception as e:
+ except Exception:
pass
return False
-
+
+def run_cmd(cmd, get_result=False):
+ result = ""
+ try:
+ out = None
+ if get_result:
+ out = subprocess.PIPE
+ re = subprocess.run(shlex.split(cmd), stdout=out, stderr=out,
+ universal_newlines=True, check=True)
+ result = str(re.stdout)
+
+ except subprocess.CalledProcessError:
+ pass
+ return result
+
class Config():
# Init default.
def __init__(self):
@@ -95,8 +110,8 @@ def get_members(self):
cmd_list = "%s member list" % (etcd_cmd)
members = ""
try:
- members = subprocess.check_output(cmd_list, shell=False)
- except subprocess.CalledProcessError as e:
+ members = run_cmd(cmd_list, get_result=True)
+ except subprocess.CalledProcessError:
pass
return members
@@ -105,25 +120,23 @@ def display_status(self):
os.environ["ETCDCTL_API"] = "3"
etcd_cmd = '%s/etcdctl --endpoints="%s"' % (os.getcwd(), self.cluster_endpoints)
- cmd_list = "%s member list 2>&1 | cat" % (etcd_cmd)
- cmd_status = "%s endpoint status 2>&1 | cat" % (etcd_cmd)
- cmd_health = "%s endpoint health 2>&1 | cat" % (etcd_cmd)
-
- out = etcd_cmd
- out += "\n\n===== member list\n" + subprocess.check_output(cmd_list, shell=False)
- print(out)
- out = "===== endpoint status\n" + subprocess.check_output(cmd_status, shell=False)
- print(out)
- out = "===== endpoint health\n" + subprocess.check_output(cmd_health, shell=False)
- print(out)
+ cmd_list = "%s member list" % (etcd_cmd)
+ cmd_status = "%s endpoint status" % (etcd_cmd)
+ cmd_health = "%s endpoint health" % (etcd_cmd)
+
+ print(etcd_cmd + "\n\n===== member list\n")
+ run_cmd(cmd_list)
+
+ print("\n===== endpoint status\n")
+ run_cmd(cmd_status)
+
+ print("\n===== endpoint health\n")
+ run_cmd(cmd_health)
# Join an existing cluster.
def join_cluster(self):
etcd_cmd = '%s/etcdctl --endpoints="%s"' % (os.getcwd(), self.cluster_endpoints)
- cmd_select = "%s member list | grep ', %s, http' | awk -F',' '{print $1}'" % (
- etcd_cmd, self.etcd_name
- )
cmd_add = "%s member add %s --peer-urls=%s" % (
etcd_cmd, self.etcd_name, self.peer_url
@@ -133,41 +146,48 @@ def join_cluster(self):
ok = True
err = None
- resp = ">> Members:\n"
try:
os.environ["ETCDCTL_API"] = "3"
- resp += self.get_members()
+ text = self.get_members()
hexid = ""
-
+ resp = ">> Members:\n" + text
+ print(resp)
+
# Remove the current entry if any
- resp += "\n>> Select:\n%s\n\n" % (cmd_select)
- hexid = subprocess.check_output(cmd_select, shell=False)
+ lines = text.split("\n")
+ for li in lines:
+ tokens = li.split(", ")
+ if len(tokens) > 3 and self.etcd_name == tokens[2]:
+ hexid = tokens[0]
+ break
if len(hexid) > 0:
- cmd_remove = "%s member remove %s" % (etcd_cmd, hexid)
- resp += "\n>> Remove:\n%s\n\n" % (cmd_remove)
-
- resp += subprocess.check_output(cmd_remove, stderr=subprocess.STDOUT, shell=False)
+ cmd_remove = "%s member remove %s\n\n" % (etcd_cmd, hexid)
+ print("\n>> Remove:\n%s" % (cmd_remove))
+ resp += cmd_remove
+
+ run_cmd(cmd_remove)
sleep(5)
# Add a new entry
- resp += "\n>> Add:\n%s\n\n" % (cmd_add)
-
- resp += subprocess.check_output(cmd_add, stderr=subprocess.STDOUT, shell=False)
-
- resp += "\n>> Members:\n"
- resp += self.get_members()
- resp += "\n"
-
- resp += cmd_rm
- resp += "\n"
+ msg = "\n>> Add:\n%s\n\n" % (cmd_add)
+ print(msg)
+ resp += msg
+
+ run_cmd(cmd_add)
+ msg = "\n>> Members:\n" + self.get_members()
+ print(msg)
+ resp += msg
+
+ msg = "\n" + cmd_rm + "\n"
+ print(msg)
+ resp += msg
except subprocess.CalledProcessError as e:
err = e.output
ok = False
- print(resp)
with open("join.log", "w+") as f:
f.write(resp)
@@ -189,7 +209,6 @@ def add_json_cfg(self):
h["advertise-client-urls"] = client_url
h["initial-advertise-peer-urls"] = self.peer_url
- dir = self.etcd_name + ".etcd"
if self.is_existing_cluster:
# Join an existing cluster
h["initial-cluster-state"] = "existing"
@@ -339,23 +358,22 @@ def sig_handler(self, sig, frame):
def is_endpoint_healthy(self, wait_time):
os.environ["ETCDCTL_API"] = "3"
etcd_cmd = '%s/etcdctl --endpoints="%s"' % (os.getcwd(), self.local_endpoint)
- cmd_health = "%s endpoint health 2>&1 | cat" % (etcd_cmd)
+ cmd_health = "%s endpoint health" % (etcd_cmd)
result = ""
now = int(time())
- for i in range(50):
- sleep(2)
+ for i in range(10):
+ sleep(5)
t = int(time()) - now
if t > wait_time:
break
- if t > 60:
- msg = "unhealthy_%s" % (self.etcd_name)
+ if t > 50:
+ msg = "unhealthy_%s retry ..." % (self.etcd_name)
self.logger.error("[MANAGER] %s" % (msg))
- result = subprocess.check_output(cmd_health, shell=False)
- health_check_bytes = str.encode("is healthy")
- if health_check_bytes in result:
+ result = run_cmd(cmd_health, get_result=True)
+ if "is health" in result:
return True
self.logger.info("[MANAGER] %s" % (result))
@@ -418,8 +436,8 @@ def watch_and_recycle(self, cfg):
print(" ")
self.logger.info("[MANAGER] Started etcd process %d" % (self.pid))
- wait_time = 85 + random.randint(0,10)
- while False:
+ wait_time = 60 + random.randint(0,10)
+ while False: #not self.is_endpoint_healthy(wait_time):
if restartCount > 0:
self.shutdown_server()
@@ -436,6 +454,8 @@ def watch_and_recycle(self, cfg):
self.shutdown(-1) # exit
print("Starting etcd process %d succeeded." % (self.pid))
+ if os.path.exists("join.log"):
+ os.remove("join.log")
self.server.wait()
# etcd server has exited.
@@ -469,7 +489,7 @@ def watch_and_recycle(self, cfg):
with open("./etcdsvr.pid", "w") as f:
f.write("%d\n" % (os.getpid()))
-
+
cfg = Config()
err = cfg.parse_cfg(False)
if err:
diff --git a/cmd/etcdsvr/tool.py b/cmd/etcdsvr/tool.py
index 65b10dbe..8a26f4cb 100755
--- a/cmd/etcdsvr/tool.py
+++ b/cmd/etcdsvr/tool.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
#
# Copyright 2023 PayPal Inc.
#
diff --git a/cmd/proxy/app/proxy.go b/cmd/proxy/app/proxy.go
index bfc55518..6855cf23 100644
--- a/cmd/proxy/app/proxy.go
+++ b/cmd/proxy/app/proxy.go
@@ -30,13 +30,13 @@ import (
"os/exec"
"path/filepath"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/config"
- "juno/pkg/cmd"
- "juno/pkg/initmgr"
- "juno/pkg/sec"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/version"
)
func Main() {
diff --git a/cmd/proxy/app/proxymgr.go b/cmd/proxy/app/proxymgr.go
index 19cc1433..f1692190 100644
--- a/cmd/proxy/app/proxymgr.go
+++ b/cmd/proxy/app/proxymgr.go
@@ -28,17 +28,17 @@ import (
"strings"
"syscall"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats"
- "juno/pkg/cmd"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/sec"
- "juno/pkg/service"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/util"
)
const (
diff --git a/cmd/proxy/app/proxymonwkr.go b/cmd/proxy/app/proxymonwkr.go
index 28ed4e7e..73ef97e7 100644
--- a/cmd/proxy/app/proxymonwkr.go
+++ b/cmd/proxy/app/proxymonwkr.go
@@ -24,14 +24,14 @@ import (
"strings"
"sync"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
)
type (
diff --git a/cmd/proxy/app/proxywkr.go b/cmd/proxy/app/proxywkr.go
index 56107f29..b2f8d92b 100644
--- a/cmd/proxy/app/proxywkr.go
+++ b/cmd/proxy/app/proxywkr.go
@@ -28,24 +28,24 @@ import (
"strconv"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/handler"
- "juno/cmd/proxy/replication"
- "juno/cmd/proxy/stats"
- "juno/cmd/proxy/stats/shmstats"
- "juno/cmd/proxy/watcher"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/sec"
- "juno/pkg/service"
- "juno/pkg/udf"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/handler"
+ "github.com/paypal/junodb/cmd/proxy/replication"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/cmd/proxy/watcher"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/udf"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/cmd/proxy/config/config.go b/cmd/proxy/config/config.go
index 8c399ad6..b00c5994 100644
--- a/cmd/proxy/config/config.go
+++ b/cmd/proxy/config/config.go
@@ -26,21 +26,21 @@ import (
"path/filepath"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- repconfig "juno/cmd/proxy/replication/config"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/initmgr"
- "juno/pkg/io"
- cal "juno/pkg/logging/cal/config"
- otel "juno/pkg/logging/otel/config"
- "juno/pkg/sec"
- "juno/pkg/service"
- "juno/pkg/util"
- "juno/pkg/version"
+ repconfig "github.com/paypal/junodb/cmd/proxy/replication/config"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/io"
+ cal "github.com/paypal/junodb/pkg/logging/cal/config"
+ otel "github.com/paypal/junodb/pkg/logging/otel/config"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/pkg/version"
)
var (
@@ -211,7 +211,7 @@ func (c *Config) IsEncryptionEnabled() bool {
return c.ReplicationEncryptionEnabled || c.PayloadEncryptionEnabled
}
-///TODO find a better name
+// /TODO find a better name
func (c *Config) GetSecFlag() (f sec.Flag) {
if c.IsTLSEnabled(true) {
f |= sec.KFlagServerTlsEnabled
diff --git a/cmd/proxy/config/limitscfg.go b/cmd/proxy/config/limitscfg.go
index 9d475c02..51d23fdd 100644
--- a/cmd/proxy/config/limitscfg.go
+++ b/cmd/proxy/config/limitscfg.go
@@ -24,9 +24,9 @@ import (
"math"
"sync"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cfg"
+ "github.com/paypal/junodb/pkg/cfg"
)
var (
diff --git a/cmd/proxy/handler/requestHandler.go b/cmd/proxy/handler/requestHandler.go
index 6d55adad..85d67abc 100644
--- a/cmd/proxy/handler/requestHandler.go
+++ b/cmd/proxy/handler/requestHandler.go
@@ -22,15 +22,15 @@ package handler
import (
"os"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/proc"
- "juno/cmd/proxy/stats"
- "juno/pkg/io"
- "juno/pkg/net/netutil"
- "juno/pkg/proto"
- "juno/pkg/service"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/proc"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/net/netutil"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/service"
)
var _ io.IRequestHandler = (*RequestHandler)(nil)
diff --git a/cmd/proxy/main.go b/cmd/proxy/main.go
index 5e18bcd4..540b7e91 100644
--- a/cmd/proxy/main.go
+++ b/cmd/proxy/main.go
@@ -19,7 +19,7 @@
package main
-import "juno/cmd/proxy/app"
+import "github.com/paypal/junodb/cmd/proxy/app"
func main() {
app.Main()
diff --git a/cmd/proxy/proc/base.go b/cmd/proxy/proc/base.go
index 76d6197f..48b65f89 100644
--- a/cmd/proxy/proc/base.go
+++ b/cmd/proxy/proc/base.go
@@ -28,22 +28,22 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/replication"
- proxystats "juno/cmd/proxy/stats"
- "juno/pkg/cluster"
- "juno/pkg/debug"
- "juno/pkg/errors"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
- "juno/pkg/shard"
- "juno/pkg/stats"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/replication"
+ proxystats "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/errors"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/util"
)
const (
@@ -173,9 +173,9 @@ func (r *ProxyInResponseContext) OnComplete() {
}
logging.LogToCal(opcode, r.GetOpStatus(), rht, calData)
}
- if otel.IsEnabled() {
- otel.RecordOperation(r.stats.Opcode.String(), r.stats.ResponseStatus.ShortNameString(), int64(rhtus))
- }
+
+ otel.RecordOperation(r.stats.Opcode.String(), r.stats.ResponseStatus, int64(rhtus))
+
r.stats.OnComplete(uint32(rhtus), r.GetOpStatus())
proxystats.SendProcState(r.stats)
@@ -339,9 +339,7 @@ func (p *ProcessorBase) replyToClient(resp *ResponseWrapper) {
if cal.IsEnabled() {
calLogReqProcError(kDecrypt, []byte(errmsg))
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kDecrypt}, {otel.Status, otel.StatusError}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kDecrypt}, {otel.Status, otel.StatusError}})
msg := p.clientRequest.CreateResponse()
msg.SetOpStatus(proto.OpStatusInternal)
var raw proto.RawMessage
@@ -571,9 +569,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("len"), szKey)
calLogReqProcEvent(kBadParamInvalidKeyLen, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
return false
}
szNs := len(r.GetNamespace())
@@ -584,9 +580,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("len"), szNs)
calLogReqProcEvent(kBadParamInvalidNsLen, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidNsLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidNsLen}})
return false
}
ttl := r.GetTimeToLive()
@@ -597,9 +591,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("ttl"), int(ttl))
calLogReqProcEvent(kBadParamInvalidTTL, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
return false
}
} else {
@@ -610,9 +602,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddInt([]byte("len"), szKey)
calLogReqProcEvent(kBadParamInvalidKeyLen, data.Bytes())
glog.Warningf("limit exceeded: key length %d > %d", szKey, limits.MaxKeyLength)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
return false
}
if limits.MaxTimeToLive != 0 && ttl > limits.MaxTimeToLive {
@@ -621,9 +611,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddInt([]byte("ttl"), int(ttl))
calLogReqProcEvent(kBadParamInvalidTTL, data.Bytes())
glog.Warningf("limit exceeded: TTL %d > %d", ttl, limits.MaxTimeToLive)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
return false
}
szValue := r.GetPayloadValueLength()
@@ -633,9 +621,7 @@ func (p *ProcessorBase) validateInboundRequest(r *proto.OperationalMessage) bool
data.AddInt([]byte("len"), int(szValue))
calLogReqProcEvent(kBadParamInvalidValueLen, data.Bytes())
glog.Warningf("limit exceeded: payload length %d > %d", szValue, limits.MaxPayloadLength)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidValueLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidValueLen}})
return false
}
}
@@ -692,11 +678,11 @@ func (p *ProcessorBase) Process(request io.IRequestContext) bool {
}
}
}
- if otel.IsEnabled() {
- if p.clientRequest.IsForReplication() {
- otel.RecordCount(otel.RAPI, nil)
- }
+
+ if p.clientRequest.IsForReplication() {
+ otel.RecordCount(otel.RAPI, nil)
}
+
p.shardId = shardId.Uint16()
if err := proto.SetShardId(p.requestContext.GetMessage(), p.shardId); err != nil {
@@ -770,9 +756,7 @@ func (p *ProcessorBase) OnRequestTimeout() {
b.AddOpCode(p.clientRequest.GetOpCode()).AddReqIdString(p.requestID)
calLogReqProcEvent(kReqTimeout, b.Bytes())
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kReqTimeout}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kReqTimeout}})
p.replyStatusToClient(proto.OpStatusBusy)
}
now := time.Now()
@@ -794,9 +778,7 @@ func (p *ProcessorBase) OnCancelled() {
b.AddOpCode(p.clientRequest.GetOpCode()).AddReqIdString(p.requestID)
calLogReqProcEvent(kReqCancelled, b.Bytes())
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kReqCancelled}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kReqCancelled}})
p.replyStatusToClient(proto.OpStatusBusy)
}
now := time.Now()
@@ -841,10 +823,8 @@ func (p *ProcessorBase) handleSSTimeout(now time.Time) {
writeBasicSSRequestInfo(b, st.opCode, int(st.ssIndex), p.ssGroup.processors[st.ssIndex].GetConnInfo(), p)
calLogReqProcEvent(calNameReqTimeoutFor(st.opCode), b.Bytes())
}
- if otel.IsEnabled() {
- status := otel.SSReqTimeout + "_" + st.opCode.String()
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, status}})
- }
+ status := otel.SSReqTimeout + "_" + st.opCode.String()
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, status}})
if cluster.GetShardMgr().StatsEnabled() {
zoneId, hostId := p.ssGroup.processors[st.ssIndex].GetNodeInfo()
cluster.GetShardMgr().SendStats(zoneId, hostId, true, confSSRequestTimeout.Microseconds())
@@ -918,10 +898,8 @@ func (p *ProcessorBase) preprocessAndValidateResponse(resp io.IResponseContext)
errStr := strings.Replace(statusText, " ", "_", -1)
calLogReqProcEvent(fmt.Sprintf("SS_%s", errStr), buf.Bytes()) //TODO revisit log as error?
}
- if otel.IsEnabled() {
- errStr := strings.Replace(statusText, " ", "_", -1)
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, fmt.Sprintf("SS_%s", errStr)}})
- }
+ errStr := strings.Replace(statusText, " ", "_", -1)
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, fmt.Sprintf("SS_%s", errStr)}})
st.state = stSSResponseIOError
st.timeRespReceived = time.Now()
p.self.OnSSIOError(st)
diff --git a/cmd/proxy/proc/create.go b/cmd/proxy/proc/create.go
index e73e3895..04904990 100644
--- a/cmd/proxy/proc/create.go
+++ b/cmd/proxy/proc/create.go
@@ -23,11 +23,11 @@ import (
"fmt"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
)
var _ ITwoPhaseProcessor = (*CreateProcessor)(nil)
@@ -82,9 +82,7 @@ func (p *CreateProcessor) setInitSSRequest() bool {
if cal.IsEnabled() {
calLogReqProcError(kEncrypt, []byte(errmsg))
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kEncrypt}, {otel.Status, otel.StatusError}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kEncrypt}, {otel.Status, otel.StatusError}})
p.replyStatusToClient(proto.OpStatusInternal)
return false
}
diff --git a/cmd/proxy/proc/destroy.go b/cmd/proxy/proc/destroy.go
index e5c17c57..2c2fe5dc 100644
--- a/cmd/proxy/proc/destroy.go
+++ b/cmd/proxy/proc/destroy.go
@@ -20,7 +20,7 @@
package proc
import (
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
var _ IOnePhaseProcessor = (*DestroyProcessor)(nil)
diff --git a/cmd/proxy/proc/destroy2.go b/cmd/proxy/proc/destroy2.go
index 2cd78632..82ab5129 100644
--- a/cmd/proxy/proc/destroy2.go
+++ b/cmd/proxy/proc/destroy2.go
@@ -20,9 +20,9 @@
package proc
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
// SUCCESS: NoError, AlreadyFulfilled, NoKey
diff --git a/cmd/proxy/proc/get.go b/cmd/proxy/proc/get.go
index 5cfdf4ba..561c6ec8 100644
--- a/cmd/proxy/proc/get.go
+++ b/cmd/proxy/proc/get.go
@@ -20,10 +20,10 @@
package proc
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
)
// SUCCESS: NoError, NoKey, MarkedDelete
diff --git a/cmd/proxy/proc/inbreqctx.go b/cmd/proxy/proc/inbreqctx.go
index 7e96b1ed..f4b614c1 100644
--- a/cmd/proxy/proc/inbreqctx.go
+++ b/cmd/proxy/proc/inbreqctx.go
@@ -24,15 +24,15 @@ import (
goio "io"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/replication"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/replication"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
)
type IInbRequestContext interface {
@@ -47,7 +47,7 @@ type IInbRequestContext interface {
ReplyStatus(st proto.OpStatus)
}
-//InboundRequestContext Proxy Inbound request context
+// InboundRequestContext Proxy Inbound request context
type InboundRequestContext struct {
io.InboundRequestContext
proto.OperationalMessage
@@ -75,9 +75,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("len"), szKey)
calLogReqProcEvent(kBadParamInvalidKeyLen, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
return false
}
szNs := len(r.GetNamespace())
@@ -88,9 +86,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("len"), szNs)
calLogReqProcEvent(kBadParamInvalidNsLen, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidNsLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidNsLen}})
return false
}
ttl := r.GetTimeToLive()
@@ -101,9 +97,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddReqIdString(r.GetRequestIDString())
data.AddInt([]byte("ttl"), int(ttl))
calLogReqProcEvent(kBadParamInvalidTTL, data.Bytes())
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
return false
}
} else {
@@ -114,9 +108,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddInt([]byte("len"), szKey)
calLogReqProcEvent(kBadParamInvalidKeyLen, data.Bytes())
glog.Warningf("limit exceeded: key length %d > %d", szKey, limits.MaxKeyLength)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidKeyLen}})
return false
}
if limits.MaxTimeToLive != 0 && ttl > limits.MaxTimeToLive {
@@ -125,9 +117,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddInt([]byte("ttl"), int(ttl))
calLogReqProcEvent(kBadParamInvalidTTL, data.Bytes())
glog.Warningf("limit exceeded: TTL %d > %d", ttl, limits.MaxTimeToLive)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidTTL}})
return false
}
szValue := r.GetPayloadValueLength()
@@ -137,9 +127,7 @@ func (r *InboundRequestContext) ValidateRequest() bool {
data.AddInt([]byte("len"), int(szValue))
calLogReqProcEvent(kBadParamInvalidValueLen, data.Bytes())
glog.Warningf("limit exceeded: payload length %d > %d", ttl, limits.MaxTimeToLive)
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidValueLen}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kBadParamInvalidValueLen}})
return false
}
}
diff --git a/cmd/proxy/proc/pconfig.go b/cmd/proxy/proc/pconfig.go
index 93beff00..c9a2c269 100644
--- a/cmd/proxy/proc/pconfig.go
+++ b/cmd/proxy/proc/pconfig.go
@@ -22,12 +22,12 @@ package proc
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/config"
- "juno/pkg/cfg"
- "juno/pkg/io"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/cfg"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
)
var (
diff --git a/cmd/proxy/proc/proc_logging.go b/cmd/proxy/proc/proc_logging.go
index b1eab84a..b332433a 100644
--- a/cmd/proxy/proc/proc_logging.go
+++ b/cmd/proxy/proc/proc_logging.go
@@ -20,11 +20,11 @@
package proc
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
var (
diff --git a/cmd/proxy/proc/processor.go b/cmd/proxy/proc/processor.go
index 18b1599b..ba29072c 100644
--- a/cmd/proxy/proc/processor.go
+++ b/cmd/proxy/proc/processor.go
@@ -22,12 +22,12 @@ package proc
import (
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
)
type IOnePhaseProcessor interface {
@@ -135,9 +135,7 @@ func (p *TwoPhaseProcessor) setInitSSRequest() bool {
if cal.IsEnabled() {
calLogReqProcError(kEncrypt, []byte(errmsg))
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kEncrypt}, {otel.Status, otel.StatusError}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Operation, kEncrypt}, {otel.Status, otel.StatusError}})
p.replyStatusToClient(proto.OpStatusInternal)
return false
}
@@ -351,9 +349,7 @@ func (p *TwoPhaseProcessor) onRepairFailure(rc *SSRequestContext) {
writeBasicSSRequestInfo(buf, rc.opCode, int(rc.ssIndex), p.ssGroup.processors[rc.ssIndex].GetConnInfo(), &p.ProcessorBase)
calLogReqProcEvent(kInconsistent, buf.Bytes())
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kInconsistent}})
- }
+ otel.RecordCount(otel.ReqProc, []otel.Tags{{otel.Status, kInconsistent}})
p.replyStatusToClient(proto.OpStatusInconsistent)
}
}
diff --git a/cmd/proxy/proc/reqProcessorPool.go b/cmd/proxy/proc/reqProcessorPool.go
index b62ffec3..6e7b1238 100644
--- a/cmd/proxy/proc/reqProcessorPool.go
+++ b/cmd/proxy/proc/reqProcessorPool.go
@@ -20,9 +20,9 @@
package proc
import (
- "juno/cmd/proxy/stats"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type ReqProcessorPool struct {
diff --git a/cmd/proxy/proc/set.go b/cmd/proxy/proc/set.go
index c3c5fb8d..7f8e3e85 100644
--- a/cmd/proxy/proc/set.go
+++ b/cmd/proxy/proc/set.go
@@ -22,10 +22,10 @@ package proc
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
var _ ITwoPhaseProcessor = (*SetProcessor)(nil)
diff --git a/cmd/proxy/proc/state.go b/cmd/proxy/proc/state.go
index 62547cc7..ac8588ea 100644
--- a/cmd/proxy/proc/state.go
+++ b/cmd/proxy/proc/state.go
@@ -20,11 +20,11 @@
package proc
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/debug"
- "juno/pkg/errors"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/errors"
+ "github.com/paypal/junodb/pkg/proto"
)
type RequestAndStats struct {
@@ -42,7 +42,7 @@ type RequestAndStats struct {
funcIsSuccess func(proto.OpStatus) bool
}
-///TODO may just change to *SSRequestContext
+// /TODO may just change to *SSRequestContext
type ResponseWrapper struct {
ssRequest *SSRequestContext
}
diff --git a/cmd/proxy/proc/udfget.go b/cmd/proxy/proc/udfget.go
index 3d3c9108..91cfe219 100644
--- a/cmd/proxy/proc/udfget.go
+++ b/cmd/proxy/proc/udfget.go
@@ -20,9 +20,9 @@
package proc
import (
- "juno/pkg/proto"
- "juno/pkg/udf"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/udf"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var _ IOnePhaseProcessor = (*UDFGetProcessor)(nil)
diff --git a/cmd/proxy/proc/update.go b/cmd/proxy/proc/update.go
index c38503c4..9f3d6d15 100644
--- a/cmd/proxy/proc/update.go
+++ b/cmd/proxy/proc/update.go
@@ -22,11 +22,11 @@ package proc
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
var _ ITwoPhaseProcessor = (*UpdateProcessor)(nil)
diff --git a/cmd/proxy/replication/config/repcfg.go b/cmd/proxy/replication/config/repcfg.go
index 4278f208..93a00a74 100644
--- a/cmd/proxy/replication/config/repcfg.go
+++ b/cmd/proxy/replication/config/repcfg.go
@@ -24,8 +24,8 @@ import (
"strings"
"time"
- "juno/pkg/io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/cmd/proxy/replication/pingreqctx.go b/cmd/proxy/replication/pingreqctx.go
index 0d715d62..c7abf39f 100644
--- a/cmd/proxy/replication/pingreqctx.go
+++ b/cmd/proxy/replication/pingreqctx.go
@@ -24,12 +24,12 @@ import (
goio "io"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/cmd/proxy/replication/replicaterequest.go b/cmd/proxy/replication/replicaterequest.go
index 5ce53dc8..bfc05e82 100644
--- a/cmd/proxy/replication/replicaterequest.go
+++ b/cmd/proxy/replication/replicaterequest.go
@@ -24,15 +24,15 @@ import (
goio "io"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
var (
@@ -146,9 +146,8 @@ func (r *RepRequestContext) complete(calstatus string, opStatus string, rht time
cal.AtomicTransaction(targetType, opCode, calstatus, rht, r.calBuf.Bytes())
}
}
- if otel.IsEnabled() {
- otel.RecordReplication(opCode, opStatus, target, rht.Milliseconds())
- }
+
+ otel.RecordReplication(opCode, opStatus, target, rht.Microseconds())
r.this.OnComplete()
}
@@ -221,9 +220,7 @@ func (r *RepRequestContext) Reply(resp io.IResponseContext) {
}
r.calBuf.AddDropReason("MaxRetry")
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.RRDropMaxRetry, []otel.Tags{{"target", r.targetId}})
- }
+ otel.RecordCount(otel.RRDropMaxRetry, []otel.Tags{{"target", r.targetId}})
r.errCnt.Add(1)
r.complete(cal.StatusError, opstatus.String(), rht, opCodeText, r.targetId)
return
@@ -245,9 +242,7 @@ func (r *RepRequestContext) Reply(resp io.IResponseContext) {
}
r.calBuf.AddDropReason("QueueFull")
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.RRDropQueueFull, []otel.Tags{{otel.Target, r.targetId}})
- }
+ otel.RecordCount(otel.RRDropQueueFull, []otel.Tags{{otel.Target, r.targetId}})
r.dropCnt.Add(1)
r.complete(cal.StatusError, opstatus.String(), rht, opCodeText, r.targetId)
}
@@ -261,9 +256,7 @@ func (r *RepRequestContext) Reply(resp io.IResponseContext) {
}
r.calBuf.AddDropReason("RecExpired")
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.RRDropRecExpired, []otel.Tags{{otel.Target, r.targetId}})
- }
+ otel.RecordCount(otel.RRDropRecExpired, []otel.Tags{{otel.Target, r.targetId}})
r.complete(cal.StatusSuccess, opstatus.String(), rht, opCodeText, r.targetId)
}
}
diff --git a/cmd/proxy/replication/replicator.go b/cmd/proxy/replication/replicator.go
index 4abcd607..b0a36b80 100644
--- a/cmd/proxy/replication/replicator.go
+++ b/cmd/proxy/replication/replicator.go
@@ -28,16 +28,16 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
-
- repconfig "juno/cmd/proxy/replication/config"
- proxystats "juno/cmd/proxy/stats"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ repconfig "github.com/paypal/junodb/cmd/proxy/replication/config"
+ proxystats "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/cmd/proxy/stats/clsConTmpl.go b/cmd/proxy/stats/clsConTmpl.go
index ad3fc5c0..a41efdaa 100644
--- a/cmd/proxy/stats/clsConTmpl.go
+++ b/cmd/proxy/stats/clsConTmpl.go
@@ -24,7 +24,7 @@ import (
"fmt"
"html/template"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/version"
)
var (
diff --git a/cmd/proxy/stats/htmlsect.go b/cmd/proxy/stats/htmlsect.go
index d490aade..b9cfdc43 100644
--- a/cmd/proxy/stats/htmlsect.go
+++ b/cmd/proxy/stats/htmlsect.go
@@ -25,10 +25,10 @@ import (
"html/template"
"time"
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/cluster"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/stats"
)
type (
diff --git a/cmd/proxy/stats/httphandler.go b/cmd/proxy/stats/httphandler.go
index 46637934..9db66df8 100644
--- a/cmd/proxy/stats/httphandler.go
+++ b/cmd/proxy/stats/httphandler.go
@@ -23,13 +23,13 @@ import (
"fmt"
"net/http"
- //"juno/third_party/forked/golang/glog"
+ //"github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats/qry"
- "juno/pkg/stats"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats/qry"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/version"
)
var (
diff --git a/cmd/proxy/stats/monhandler.go b/cmd/proxy/stats/monhandler.go
index aac7d7a8..cbf728eb 100644
--- a/cmd/proxy/stats/monhandler.go
+++ b/cmd/proxy/stats/monhandler.go
@@ -31,12 +31,12 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/stats"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/version"
)
var ()
diff --git a/cmd/proxy/stats/qry/infoquery.go b/cmd/proxy/stats/qry/infoquery.go
index 0b6e6fc9..a3f363af 100644
--- a/cmd/proxy/stats/qry/infoquery.go
+++ b/cmd/proxy/stats/qry/infoquery.go
@@ -27,7 +27,7 @@ import (
"strconv"
"strings"
- "juno/pkg/cluster"
+ "github.com/paypal/junodb/pkg/cluster"
)
var (
diff --git a/cmd/proxy/stats/shmstats/shmstats.go b/cmd/proxy/stats/shmstats/shmstats.go
index 29b5878f..42969265 100644
--- a/cmd/proxy/stats/shmstats/shmstats.go
+++ b/cmd/proxy/stats/shmstats/shmstats.go
@@ -34,12 +34,12 @@ import (
"unsafe"
// "github.com/BurntSushi/toml"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/config"
- "juno/pkg/io"
- "juno/pkg/stats"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/util"
)
const (
@@ -98,7 +98,7 @@ type (
Type uint16
CapQueue uint16
Addr [256]byte
- Name [12]byte
+ Name [256]byte
}
serverStatsManagerT struct {
stats *ServerStats
@@ -944,7 +944,7 @@ func GetListenerStats() (stats []ListenerStats) {
return
}
-//TODO make sure shmStats has been initialized....
+// TODO make sure shmStats has been initialized....
func GetCurrentWorkerStatsManager() *workerStatsManagerT {
return shmStats.current
}
diff --git a/cmd/proxy/stats/shmstatswr.go b/cmd/proxy/stats/shmstatswr.go
index e8b2aba8..b2ab3d90 100644
--- a/cmd/proxy/stats/shmstatswr.go
+++ b/cmd/proxy/stats/shmstatswr.go
@@ -25,9 +25,9 @@ import (
"time"
"unsafe"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/logging/cal"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/stats"
)
var (
diff --git a/cmd/proxy/stats/statelog.go b/cmd/proxy/stats/statelog.go
index bf604907..d8a86328 100644
--- a/cmd/proxy/stats/statelog.go
+++ b/cmd/proxy/stats/statelog.go
@@ -31,13 +31,13 @@ import (
"syscall"
"time"
- // "juno/third_party/forked/golang/glog"
+ // "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cluster"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/stats"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/util"
)
// counters
diff --git a/cmd/proxy/stats/statsinit.go b/cmd/proxy/stats/statsinit.go
index c06d369a..55d6da3c 100644
--- a/cmd/proxy/stats/statsinit.go
+++ b/cmd/proxy/stats/statsinit.go
@@ -22,9 +22,9 @@ package stats
import (
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
)
const (
@@ -39,9 +39,9 @@ type (
)
/*
- Arguments
- arg 0: Type stats.Type
- arg 1: WorkerId int, if Type == KTypeWorker
+Arguments
+arg 0: Type stats.Type
+arg 1: WorkerId int, if Type == KTypeWorker
*/
func Initialize(args ...interface{}) (err error) {
var (
diff --git a/cmd/proxy/stats/statslogger.go b/cmd/proxy/stats/statslogger.go
index 80cd7d0f..bff0eba5 100644
--- a/cmd/proxy/stats/statslogger.go
+++ b/cmd/proxy/stats/statslogger.go
@@ -29,12 +29,12 @@ import (
"path/filepath"
"time"
- "juno/cmd/proxy/config"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/io"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/stats"
)
var (
diff --git a/cmd/proxy/watcher/watcher.go b/cmd/proxy/watcher/watcher.go
index 35befb7d..056b44c7 100644
--- a/cmd/proxy/watcher/watcher.go
+++ b/cmd/proxy/watcher/watcher.go
@@ -28,12 +28,12 @@ import (
clientv3 "go.etcd.io/etcd/client/v3"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/proc"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/proxy/proc"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/util"
)
type Watcher struct {
diff --git a/cmd/storageserv/app/ssmgr.go b/cmd/storageserv/app/ssmgr.go
index 4ee27b01..2a1f4d18 100644
--- a/cmd/storageserv/app/ssmgr.go
+++ b/cmd/storageserv/app/ssmgr.go
@@ -26,14 +26,14 @@ import (
"net"
"os"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/storageserv/config"
- "juno/pkg/cmd"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/net/netutil"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/net/netutil"
)
const (
@@ -97,7 +97,7 @@ func (c *Manager) Parse(args []string) (err error) {
return
}
-///TODO refactoring
+// /TODO refactoring
func (c *Manager) Exec() {
initmgr.Register(config.Initializer, c.optConfigFile)
diff --git a/cmd/storageserv/app/ssmonwkr.go b/cmd/storageserv/app/ssmonwkr.go
index dbe9ada7..6e2311f5 100644
--- a/cmd/storageserv/app/ssmonwkr.go
+++ b/cmd/storageserv/app/ssmonwkr.go
@@ -24,14 +24,14 @@ import (
"strings"
"sync"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/stats"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/stats"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
)
type (
diff --git a/cmd/storageserv/app/sswkr.go b/cmd/storageserv/app/sswkr.go
index 73c7474f..10aa38c2 100644
--- a/cmd/storageserv/app/sswkr.go
+++ b/cmd/storageserv/app/sswkr.go
@@ -26,24 +26,24 @@ import (
"os"
"strconv"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/dbscanserv/patch"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/handler"
- "juno/cmd/storageserv/redist"
- "juno/cmd/storageserv/stats"
- "juno/cmd/storageserv/storage"
-
- "juno/cmd/storageserv/compact"
- "juno/cmd/storageserv/watcher"
- "juno/pkg/cluster"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/service"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/dbscanserv/patch"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/handler"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/cmd/storageserv/stats"
+ "github.com/paypal/junodb/cmd/storageserv/storage"
+
+ "github.com/paypal/junodb/cmd/storageserv/compact"
+ "github.com/paypal/junodb/cmd/storageserv/watcher"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/util"
)
type Worker struct {
diff --git a/cmd/storageserv/app/storagemgr.go b/cmd/storageserv/app/storagemgr.go
index ee9c288d..20b88626 100644
--- a/cmd/storageserv/app/storagemgr.go
+++ b/cmd/storageserv/app/storagemgr.go
@@ -34,10 +34,10 @@ import (
"syscall"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/cmd/storageserv/app/storageserv.go b/cmd/storageserv/app/storageserv.go
index 11d8ac57..f2d1b4bd 100644
--- a/cmd/storageserv/app/storageserv.go
+++ b/cmd/storageserv/app/storageserv.go
@@ -26,9 +26,9 @@ import (
"path/filepath"
"strings"
- "juno/pkg/cmd"
- "juno/pkg/initmgr"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/version"
)
func init() {
@@ -96,7 +96,7 @@ func Main() {
}
-//TODO may customize this or remove inappalicable glob flags
+// TODO may customize this or remove inappalicable glob flags
func printUsage() {
progName := filepath.Base(os.Args[0])
fmt.Printf(`
diff --git a/cmd/storageserv/compact/dbclient.go b/cmd/storageserv/compact/dbclient.go
index 6d92d985..4428530a 100644
--- a/cmd/storageserv/compact/dbclient.go
+++ b/cmd/storageserv/compact/dbclient.go
@@ -28,10 +28,10 @@ import (
"path/filepath"
"time"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/service"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
)
type DbClient struct {
diff --git a/cmd/storageserv/compact/filter.go b/cmd/storageserv/compact/filter.go
index 226e4aa6..53d0cace 100644
--- a/cmd/storageserv/compact/filter.go
+++ b/cmd/storageserv/compact/filter.go
@@ -24,7 +24,7 @@ import (
"github.com/BurntSushi/toml"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type namespaceFilter struct {
diff --git a/cmd/storageserv/config/config.go b/cmd/storageserv/config/config.go
index 524a3de3..253d1f70 100644
--- a/cmd/storageserv/config/config.go
+++ b/cmd/storageserv/config/config.go
@@ -29,23 +29,23 @@ import (
"path/filepath"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- dbscan "juno/cmd/dbscanserv/config"
- "juno/cmd/storageserv/redist"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/initmgr"
- "juno/pkg/io"
- cal "juno/pkg/logging/cal/config"
- otel "juno/pkg/logging/otel/config"
- "juno/pkg/service"
- "juno/pkg/shard"
- "juno/pkg/util"
- "juno/pkg/version"
+ dbscan "github.com/paypal/junodb/cmd/dbscanserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/io"
+ cal "github.com/paypal/junodb/pkg/logging/cal/config"
+ otel "github.com/paypal/junodb/pkg/logging/otel/config"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/pkg/version"
)
var Initializer initmgr.IInitializer = initmgr.NewInitializer(initialize, finalize)
diff --git a/cmd/storageserv/handler/reqhandler.go b/cmd/storageserv/handler/reqhandler.go
index 9c8fe70e..a029b790 100644
--- a/cmd/storageserv/handler/reqhandler.go
+++ b/cmd/storageserv/handler/reqhandler.go
@@ -20,12 +20,12 @@
package handler
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/storage"
- "juno/pkg/io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/storage"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
)
var _ io.IRequestHandler = (*RequestHandler)(nil)
diff --git a/cmd/storageserv/main.go b/cmd/storageserv/main.go
index 271a0523..1c7fb879 100644
--- a/cmd/storageserv/main.go
+++ b/cmd/storageserv/main.go
@@ -19,7 +19,7 @@
package main
-import "juno/cmd/storageserv/app"
+import "github.com/paypal/junodb/cmd/storageserv/app"
func main() {
app.Main()
diff --git a/cmd/storageserv/redist/config.go b/cmd/storageserv/redist/config.go
index 48aa4ea5..4134fc8a 100644
--- a/cmd/storageserv/redist/config.go
+++ b/cmd/storageserv/redist/config.go
@@ -20,9 +20,10 @@
package redist
import (
- "juno/pkg/io"
- "juno/pkg/util"
"time"
+
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
)
type Config struct {
diff --git a/cmd/storageserv/redist/ratelimiter.go b/cmd/storageserv/redist/ratelimiter.go
index b98359a8..5cf06cc0 100644
--- a/cmd/storageserv/redist/ratelimiter.go
+++ b/cmd/storageserv/redist/ratelimiter.go
@@ -20,8 +20,9 @@
package redist
import (
- "juno/third_party/forked/golang/glog"
"time"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// A variantion of token bucket algorithm
diff --git a/cmd/storageserv/redist/redist.go b/cmd/storageserv/redist/redist.go
index d4d6a9d7..baf3fd43 100644
--- a/cmd/storageserv/redist/redist.go
+++ b/cmd/storageserv/redist/redist.go
@@ -26,13 +26,13 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/etcd"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/shard"
- redistst "juno/pkg/stats/redist"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ redistst "github.com/paypal/junodb/pkg/stats/redist"
)
type IDBRedistHandler interface {
diff --git a/cmd/storageserv/redist/replicator.go b/cmd/storageserv/redist/replicator.go
index c7a28a56..4ea068c8 100644
--- a/cmd/storageserv/redist/replicator.go
+++ b/cmd/storageserv/redist/replicator.go
@@ -24,14 +24,14 @@ import (
"sync"
"time"
- cerr "juno/pkg/errors"
- "juno/pkg/etcd"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/shard"
- redistst "juno/pkg/stats/redist"
-
- "juno/third_party/forked/golang/glog"
+ cerr "github.com/paypal/junodb/pkg/errors"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ redistst "github.com/paypal/junodb/pkg/stats/redist"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type Replicator struct {
diff --git a/cmd/storageserv/redist/reqctx.go b/cmd/storageserv/redist/reqctx.go
index 249abd99..f0edfaec 100644
--- a/cmd/storageserv/redist/reqctx.go
+++ b/cmd/storageserv/redist/reqctx.go
@@ -24,12 +24,12 @@ import (
"io"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- . "juno/pkg/io"
- "juno/pkg/proto"
- redistst "juno/pkg/stats/redist"
- "juno/pkg/util"
+ . "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ redistst "github.com/paypal/junodb/pkg/stats/redist"
+ "github.com/paypal/junodb/pkg/util"
)
type RedistRequestContext struct {
diff --git a/cmd/storageserv/stats/htmlsect.go b/cmd/storageserv/stats/htmlsect.go
index 86d45177..11d02fbc 100644
--- a/cmd/storageserv/stats/htmlsect.go
+++ b/cmd/storageserv/stats/htmlsect.go
@@ -25,8 +25,8 @@ import (
"html/template"
"time"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/stats"
)
type (
diff --git a/cmd/storageserv/stats/htmltmpl.go b/cmd/storageserv/stats/htmltmpl.go
index 5fbe57ed..687ce5fd 100644
--- a/cmd/storageserv/stats/htmltmpl.go
+++ b/cmd/storageserv/stats/htmltmpl.go
@@ -23,7 +23,7 @@ import (
"fmt"
"html/template"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/pkg/stats"
)
var (
diff --git a/cmd/storageserv/stats/httphandler.go b/cmd/storageserv/stats/httphandler.go
index e4b1608a..b36d8eed 100644
--- a/cmd/storageserv/stats/httphandler.go
+++ b/cmd/storageserv/stats/httphandler.go
@@ -25,11 +25,11 @@ import (
"github.com/BurntSushi/toml"
- "juno/cmd/proxy/stats/qry"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/stats"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/proxy/stats/qry"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/version"
)
var (
diff --git a/cmd/storageserv/stats/monhandler.go b/cmd/storageserv/stats/monhandler.go
index d965aa1b..0eb335b5 100644
--- a/cmd/storageserv/stats/monhandler.go
+++ b/cmd/storageserv/stats/monhandler.go
@@ -29,12 +29,12 @@ import (
"strconv"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/stats"
- "juno/pkg/version"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/version"
)
type (
diff --git a/cmd/storageserv/stats/shmstats/shmstats.go b/cmd/storageserv/stats/shmstats/shmstats.go
index 66b1e7d3..87ecfdc8 100644
--- a/cmd/storageserv/stats/shmstats/shmstats.go
+++ b/cmd/storageserv/stats/shmstats/shmstats.go
@@ -32,10 +32,10 @@ import (
"time"
"unsafe"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/pkg/stats"
)
const (
diff --git a/cmd/storageserv/stats/shmstatswr.go b/cmd/storageserv/stats/shmstatswr.go
index 042e0b39..d2fb50c7 100644
--- a/cmd/storageserv/stats/shmstatswr.go
+++ b/cmd/storageserv/stats/shmstatswr.go
@@ -25,8 +25,8 @@ import (
"time"
"unsafe"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/stats"
)
var (
diff --git a/cmd/storageserv/stats/statelog.go b/cmd/storageserv/stats/statelog.go
index 723cf7e9..66d27b6f 100644
--- a/cmd/storageserv/stats/statelog.go
+++ b/cmd/storageserv/stats/statelog.go
@@ -31,9 +31,9 @@ import (
"syscall"
"time"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/proto"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/stats"
)
const (
@@ -46,7 +46,7 @@ const (
kNumRequestTypes
)
-//Exponential Moving Average (EMA)
+// Exponential Moving Average (EMA)
var (
statsNumRequests uint64
statsNumRequestsPrev uint64
diff --git a/cmd/storageserv/stats/statsinit.go b/cmd/storageserv/stats/statsinit.go
index d1e2ed95..8b7f4cfe 100644
--- a/cmd/storageserv/stats/statsinit.go
+++ b/cmd/storageserv/stats/statsinit.go
@@ -22,11 +22,11 @@ package stats
import (
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/debug"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/debug"
)
func InitForManager(numChildren int) (err error) {
diff --git a/cmd/storageserv/stats/statslogger.go b/cmd/storageserv/stats/statslogger.go
index a36ca100..79ca3643 100644
--- a/cmd/storageserv/stats/statslogger.go
+++ b/cmd/storageserv/stats/statslogger.go
@@ -29,13 +29,13 @@ import (
"path/filepath"
"time"
- // "juno/third_party/forked/golang/glog"
+ // "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/stats"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/stats"
)
var (
diff --git a/cmd/storageserv/storage/bench_test.go b/cmd/storageserv/storage/bench_test.go
index 90070c04..580fce6e 100644
--- a/cmd/storageserv/storage/bench_test.go
+++ b/cmd/storageserv/storage/bench_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
func BenchmarkSet(b *testing.B) {
diff --git a/cmd/storageserv/storage/create_test.go b/cmd/storageserv/storage/create_test.go
index 25dd5d47..77cd1d26 100644
--- a/cmd/storageserv/storage/create_test.go
+++ b/cmd/storageserv/storage/create_test.go
@@ -24,7 +24,7 @@ import (
"testing"
"time"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
var (
diff --git a/cmd/storageserv/storage/db/config.go b/cmd/storageserv/storage/db/config.go
index f7df81f7..eb7ddd95 100644
--- a/cmd/storageserv/storage/db/config.go
+++ b/cmd/storageserv/storage/db/config.go
@@ -26,8 +26,8 @@ import (
"math/rand"
"os"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
)
///TODO need to add validation
@@ -242,7 +242,7 @@ var defaultFlashConfig = Config{
var DBConfig = defaultFlashConfig
-//Note: rocksdb C binding does not support getters for option types
+// Note: rocksdb C binding does not support getters for option types
func NewRocksDBptions() *gorocksdb.Options {
options := gorocksdb.NewDefaultOptions()
diff --git a/cmd/storageserv/storage/db/db.go b/cmd/storageserv/storage/db/db.go
index 60b4d8b1..ed67979a 100644
--- a/cmd/storageserv/storage/db/db.go
+++ b/cmd/storageserv/storage/db/db.go
@@ -22,8 +22,8 @@ package db
import (
"io"
- "juno/cmd/storageserv/redist"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/pkg/shard"
)
type IDatabase interface {
diff --git a/cmd/storageserv/storage/db/dbcopy/cmd.go b/cmd/storageserv/storage/db/dbcopy/cmd.go
index 3c66333a..c1fde68d 100644
--- a/cmd/storageserv/storage/db/dbcopy/cmd.go
+++ b/cmd/storageserv/storage/db/dbcopy/cmd.go
@@ -22,7 +22,7 @@ package main
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type CmdLine struct {
diff --git a/cmd/storageserv/storage/db/dbcopy/compact.go b/cmd/storageserv/storage/db/dbcopy/compact.go
index c5541641..fc280869 100644
--- a/cmd/storageserv/storage/db/dbcopy/compact.go
+++ b/cmd/storageserv/storage/db/dbcopy/compact.go
@@ -21,7 +21,8 @@ package main
import (
"bytes"
- "juno/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type CompactionFilter struct {
diff --git a/cmd/storageserv/storage/db/dbcopy/config.go b/cmd/storageserv/storage/db/dbcopy/config.go
index a1834ee4..7fe3da6b 100644
--- a/cmd/storageserv/storage/db/dbcopy/config.go
+++ b/cmd/storageserv/storage/db/dbcopy/config.go
@@ -28,9 +28,9 @@ import (
"github.com/BurntSushi/toml"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/storage/db"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var cfg = config.Config{
diff --git a/cmd/storageserv/storage/db/dbcopy/dbclient.go b/cmd/storageserv/storage/db/dbcopy/dbclient.go
index d6b27c85..bfeae710 100644
--- a/cmd/storageserv/storage/db/dbcopy/dbclient.go
+++ b/cmd/storageserv/storage/db/dbcopy/dbclient.go
@@ -27,11 +27,11 @@ import (
"path/filepath"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/util"
)
type DbClient struct {
diff --git a/cmd/storageserv/storage/db/dbcopy/main.go b/cmd/storageserv/storage/db/dbcopy/main.go
index d0a767db..6c288aee 100644
--- a/cmd/storageserv/storage/db/dbcopy/main.go
+++ b/cmd/storageserv/storage/db/dbcopy/main.go
@@ -31,7 +31,7 @@ import (
"strings"
"sync"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func parseKeyRange(key string) (start int, stop int) {
diff --git a/cmd/storageserv/storage/db/debug.go b/cmd/storageserv/storage/db/debug.go
index 57f32f91..e73a7485 100644
--- a/cmd/storageserv/storage/db/debug.go
+++ b/cmd/storageserv/storage/db/debug.go
@@ -28,7 +28,7 @@ import (
"sync"
"unsafe"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
)
var (
diff --git a/cmd/storageserv/storage/db/record.go b/cmd/storageserv/storage/db/record.go
index 9ae2675d..86557a3c 100644
--- a/cmd/storageserv/storage/db/record.go
+++ b/cmd/storageserv/storage/db/record.go
@@ -22,39 +22,38 @@ Package db implements Juno storage interfaces with gorocksdb.
Record Encoding Format
- Offset | Field | Size
- --------+---------------------------------+---------------
- 0 | encoding version | 1 byte
- --------+---------------------------------+---------------
- 1 | flag | 1 byte
- --------+---------------------------------+---------------
- 2 | reserved | 2 bytes
- --------+---------------------------------+---------------
- 4 | expiration time | 4 bytes
- --------+---------------------------------+---------------
- 8 | version | 4 bytes
- --------+---------------------------------+---------------
- 12 | creation time | 4 bytes
- --------+---------------------------------+---------------
- 16 | last modification time | 8 bytes
- --------+---------------------------------+---------------
- 24 | request Id of the last modifier | 16 bytes
- --------+---------------------------------+---------------
- 40 | request Id of the originator | 16 bytes
- --------+---------------------------------+---------------
- 56 | encapsulating payload | ...
-
- Record Flag
- bit | 0| 1| 2| 3| 4| 5| 6| 7
- ------+------------+------------+------------+------------+------------+------------+------------+------------+
- | MarkDelete |
-
+ Offset | Field | Size
+ --------+---------------------------------+---------------
+ 0 | encoding version | 1 byte
+ --------+---------------------------------+---------------
+ 1 | flag | 1 byte
+ --------+---------------------------------+---------------
+ 2 | reserved | 2 bytes
+ --------+---------------------------------+---------------
+ 4 | expiration time | 4 bytes
+ --------+---------------------------------+---------------
+ 8 | version | 4 bytes
+ --------+---------------------------------+---------------
+ 12 | creation time | 4 bytes
+ --------+---------------------------------+---------------
+ 16 | last modification time | 8 bytes
+ --------+---------------------------------+---------------
+ 24 | request Id of the last modifier | 16 bytes
+ --------+---------------------------------+---------------
+ 40 | request Id of the originator | 16 bytes
+ --------+---------------------------------+---------------
+ 56 | encapsulating payload | ...
+
+ Record Flag
+ bit | 0| 1| 2| 3| 4| 5| 6| 7
+ ------+------------+------------+------------+------------+------------+------------+------------+------------+
+ | MarkDelete |
Storage Key Format
- ----------------------------+----------- +--------
- namespace length (1 byte) | namespace | key
- ----------------------------+----------- +--------
+ ----------------------------+----------- +--------
+ namespace length (1 byte) | namespace | key
+ ----------------------------+----------- +--------
*/
package db
@@ -66,12 +65,12 @@ import (
"io"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/proto"
- "juno/pkg/shard"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/util"
)
const (
@@ -234,7 +233,7 @@ func (rec *Record) EncodeToBuffer(buffer *bytes.Buffer) error {
return nil
}
-///TODO validation. the slices
+// /TODO validation. the slices
func (rec *Record) Decode(data []byte) error {
if data == nil || len(data) < kSzHeader {
return errors.New("Decoding error: empty")
diff --git a/cmd/storageserv/storage/db/recordid.go b/cmd/storageserv/storage/db/recordid.go
index 8ff6103e..b46c5c1f 100644
--- a/cmd/storageserv/storage/db/recordid.go
+++ b/cmd/storageserv/storage/db/recordid.go
@@ -23,9 +23,9 @@ import (
"bytes"
"encoding/binary"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/pkg/shard"
)
var enableMircoShardId bool = false // default false for backward compatibility
diff --git a/cmd/storageserv/storage/db/recordid_test.go b/cmd/storageserv/storage/db/recordid_test.go
index 29f07345..1da0f86d 100644
--- a/cmd/storageserv/storage/db/recordid_test.go
+++ b/cmd/storageserv/storage/db/recordid_test.go
@@ -22,8 +22,9 @@ package db
import (
"bytes"
"fmt"
- "juno/pkg/shard"
"testing"
+
+ "github.com/paypal/junodb/pkg/shard"
)
func TestNoMicroShard(t *testing.T) {
diff --git a/cmd/storageserv/storage/db/rocksdb.go b/cmd/storageserv/storage/db/rocksdb.go
index 11b1d13c..dd5a29bb 100644
--- a/cmd/storageserv/storage/db/rocksdb.go
+++ b/cmd/storageserv/storage/db/rocksdb.go
@@ -28,14 +28,14 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
-
- "juno/cmd/storageserv/redist"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
+
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
)
var (
@@ -92,7 +92,7 @@ func GetPrefixDB() *ShardingByPrefix {
return nil
}
-///TODO xuli dbDir...
+// /TODO xuli dbDir...
func newDBSharding(numShards int, numMicroShards int, numMicroShardGroups int, numPrefixDbs int, dbnamePrefix string) (sharding IDBSharding) {
if numPrefixDbs > 0 { // Use prefix key
shardFilters := make([]*ShardFilter, numPrefixDbs, numPrefixDbs)
@@ -115,7 +115,7 @@ func newDBSharding(numShards int, numMicroShards int, numMicroShardGroups int, n
return
}
-///TODO dbDir...
+// /TODO dbDir...
func newRocksDB(numShards int, numMicroShards int, numMicroShardGroups int, numPrefixDbs int, zoneId int, nodeId int, shardMap shard.Map) *RocksDB {
db := &RocksDB{
zoneId: zoneId,
diff --git a/cmd/storageserv/storage/db/sharding.go b/cmd/storageserv/storage/db/sharding.go
index bfc3eedf..b24723bb 100644
--- a/cmd/storageserv/storage/db/sharding.go
+++ b/cmd/storageserv/storage/db/sharding.go
@@ -23,10 +23,10 @@ import (
"io"
"time"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/storageserv/redist"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/pkg/shard"
)
type IDBSharding interface {
diff --git a/cmd/storageserv/storage/db/shardingByInstance.go b/cmd/storageserv/storage/db/shardingByInstance.go
index fcd95a99..0a7dfbe4 100644
--- a/cmd/storageserv/storage/db/shardingByInstance.go
+++ b/cmd/storageserv/storage/db/shardingByInstance.go
@@ -25,13 +25,13 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/storageserv/redist"
- "juno/pkg/shard"
- redistst "juno/pkg/stats/redist"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/pkg/shard"
+ redistst "github.com/paypal/junodb/pkg/stats/redist"
+ "github.com/paypal/junodb/pkg/util"
)
type ShardingByInstance struct {
diff --git a/cmd/storageserv/storage/db/shardingByPrefix.go b/cmd/storageserv/storage/db/shardingByPrefix.go
index fefd006d..e32988dc 100644
--- a/cmd/storageserv/storage/db/shardingByPrefix.go
+++ b/cmd/storageserv/storage/db/shardingByPrefix.go
@@ -28,13 +28,13 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- "juno/cmd/storageserv/redist"
- "juno/pkg/shard"
- redistst "juno/pkg/stats/redist"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/pkg/shard"
+ redistst "github.com/paypal/junodb/pkg/stats/redist"
+ "github.com/paypal/junodb/pkg/util"
)
type ShardFilter struct {
diff --git a/cmd/storageserv/storage/delete_test.go b/cmd/storageserv/storage/delete_test.go
index 791add9c..969cb74c 100644
--- a/cmd/storageserv/storage/delete_test.go
+++ b/cmd/storageserv/storage/delete_test.go
@@ -24,8 +24,8 @@ import (
"testing"
"time"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/cmd/storageserv/storage/get_test.go b/cmd/storageserv/storage/get_test.go
index 1143f49d..150bb479 100644
--- a/cmd/storageserv/storage/get_test.go
+++ b/cmd/storageserv/storage/get_test.go
@@ -25,8 +25,8 @@ package storage
import (
"testing"
- "juno/pkg/proto"
- "juno/test/testutil"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
)
var (
diff --git a/cmd/storageserv/storage/lock.go b/cmd/storageserv/storage/lock.go
index 8b781cf8..19c14ccd 100644
--- a/cmd/storageserv/storage/lock.go
+++ b/cmd/storageserv/storage/lock.go
@@ -22,12 +22,12 @@ package storage
import (
"sync"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/logging"
- "juno/pkg/proto"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
)
var (
diff --git a/cmd/storageserv/storage/proc.go b/cmd/storageserv/storage/proc.go
index 647cbbe8..c744c5c8 100644
--- a/cmd/storageserv/storage/proc.go
+++ b/cmd/storageserv/storage/proc.go
@@ -26,20 +26,20 @@ import (
"runtime"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/storageserv/config"
- ssstats "juno/cmd/storageserv/stats"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/debug"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
- "juno/pkg/shard"
- "juno/pkg/stats"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ ssstats "github.com/paypal/junodb/cmd/storageserv/stats"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/stats"
+ "github.com/paypal/junodb/pkg/util"
)
const (
@@ -116,19 +116,13 @@ func (p *reqProcCtxT) OnComplete() {
calData.AddOpRequestResponse(&p.request, &p.response).AddRequestHandleTime(rhtus)
cal.AtomicTransaction(cal.TxnTypeAPI, opcode.String(), calst.CalStatus(), rht, calData.Bytes())
}
- if otel.IsEnabled() {
- otel.RecordOperation(opcode.String(), p.response.GetOpStatus().String(), int64(rhtus))
- opst := p.response.GetOpStatus()
- calst := logging.CalStatus(opst)
- if (opst == proto.OpStatusInconsistent) || calst.NotSuccess() {
- otel.RecordCount(otel.ProcErr, []otel.Tags{{otel.Operation, opcode.String() + "_" + opst.String()}, {otel.Status, otel.StatusError}})
- }
- }
if (opst == proto.OpStatusInconsistent) || calst.NotSuccess() {
cal.Event("ProcErr", opcode.String()+"_"+opst.String(), cal.StatusSuccess, nil)
}
}
+ otel.RecordOperation(opcode.String(), p.response.GetOpStatus(), int64(rhtus))
+
if p.cacheable {
if p.prepareCtx != nil {
if p.prepareCtx.cacheable {
diff --git a/cmd/storageserv/storage/set_test.go b/cmd/storageserv/storage/set_test.go
index 4cba2f4b..89b5b24e 100644
--- a/cmd/storageserv/storage/set_test.go
+++ b/cmd/storageserv/storage/set_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
var (
diff --git a/cmd/storageserv/storage/setup_test.go b/cmd/storageserv/storage/setup_test.go
index ad72be99..1eebff06 100644
--- a/cmd/storageserv/storage/setup_test.go
+++ b/cmd/storageserv/storage/setup_test.go
@@ -24,11 +24,11 @@ import (
"os"
"testing"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/shard"
)
func testSetup() {
diff --git a/cmd/storageserv/storage/storage.go b/cmd/storageserv/storage/storage.go
index 62d576c7..f2010843 100644
--- a/cmd/storageserv/storage/storage.go
+++ b/cmd/storageserv/storage/storage.go
@@ -27,21 +27,21 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/dbscanserv/patch"
- "juno/cmd/storageserv/config"
- "juno/cmd/storageserv/redist"
- "juno/cmd/storageserv/storage/db"
- "juno/cmd/storageserv/watcher"
- "juno/pkg/cluster"
- "juno/pkg/debug"
- "juno/pkg/etcd"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/shard"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/dbscanserv/patch"
+ "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/cmd/storageserv/redist"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/cmd/storageserv/watcher"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/util"
)
var (
@@ -1125,7 +1125,7 @@ func TruncateExpired() {
}
// TODO: revisit...
-//Used to detect replication conflict. Not for conditional update
+// Used to detect replication conflict. Not for conditional update
func isConflict(request *proto.OperationalMessage, rec *db.Record) (conflict bool) {
lmt := request.GetLastModificationTime()
if lmt != 0 {
diff --git a/cmd/storageserv/storage/storage_test.go b/cmd/storageserv/storage/storage_test.go
index 3a30b8e9..e3b89ac2 100644
--- a/cmd/storageserv/storage/storage_test.go
+++ b/cmd/storageserv/storage/storage_test.go
@@ -27,12 +27,12 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/storageserv/storage/db"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/cmd/storageserv/storage/db"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/shard"
)
const (
diff --git a/cmd/storageserv/storage/update_test.go b/cmd/storageserv/storage/update_test.go
index 7ec45b3a..25703ef0 100644
--- a/cmd/storageserv/storage/update_test.go
+++ b/cmd/storageserv/storage/update_test.go
@@ -23,8 +23,8 @@ import (
"testing"
"time"
- "juno/pkg/proto"
- // "juno/test/testutil"
+ "github.com/paypal/junodb/pkg/proto"
+ // "github.com/paypal/junodb/test/testutil"
)
var (
diff --git a/cmd/storageserv/watcher/watcher.go b/cmd/storageserv/watcher/watcher.go
index b4a12206..f7ac87ef 100644
--- a/cmd/storageserv/watcher/watcher.go
+++ b/cmd/storageserv/watcher/watcher.go
@@ -27,13 +27,13 @@ import (
"strconv"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
clientv3 "go.etcd.io/etcd/client/v3"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/shard"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/shard"
)
// watch for the following etcd changes
diff --git a/cmd/tools/cmd/cfg/cfggen.go b/cmd/tools/cmd/cfg/cfggen.go
index 856865cf..9b12e917 100644
--- a/cmd/tools/cmd/cfg/cfggen.go
+++ b/cmd/tools/cmd/cfg/cfggen.go
@@ -26,9 +26,9 @@ import (
"github.com/BurntSushi/toml"
- "juno/cmd/proxy/config"
- sscfg "juno/cmd/storageserv/config"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ sscfg "github.com/paypal/junodb/cmd/storageserv/config"
+ "github.com/paypal/junodb/pkg/cmd"
)
type cfgTypeT int
diff --git a/cmd/tools/cmd/cfg/conf.go b/cmd/tools/cmd/cfg/conf.go
index add9a23c..3d17fb07 100644
--- a/cmd/tools/cmd/cfg/conf.go
+++ b/cmd/tools/cmd/cfg/conf.go
@@ -25,8 +25,8 @@ import (
"os"
"strings"
- "juno/pkg/cfg"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/pkg/cfg"
+ "github.com/paypal/junodb/pkg/cmd"
)
type cmdConfUnify struct {
diff --git a/cmd/tools/cmd/cfg/rtcfg.go b/cmd/tools/cmd/cfg/rtcfg.go
index 70b30bc3..b1bdb2e0 100644
--- a/cmd/tools/cmd/cfg/rtcfg.go
+++ b/cmd/tools/cmd/cfg/rtcfg.go
@@ -26,11 +26,11 @@ import (
"os"
"time"
- "juno/cmd/proxy/config"
- "juno/pkg/cfg"
- "juno/pkg/client"
- "juno/pkg/cmd"
- "juno/pkg/etcd"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/cfg"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/etcd"
)
const (
diff --git a/cmd/tools/cmd/cli/cli.go b/cmd/tools/cmd/cli/cli.go
index 8e1c5fec..d90f1490 100644
--- a/cmd/tools/cmd/cli/cli.go
+++ b/cmd/tools/cmd/cli/cli.go
@@ -26,17 +26,17 @@ import (
"os"
"time"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/cal/config"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
uuid "github.com/satori/go.uuid"
- "juno/pkg/client"
- "juno/pkg/cmd"
- "juno/pkg/sec"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/util"
)
const (
diff --git a/cmd/tools/cmd/cli/sscli.go b/cmd/tools/cmd/cli/sscli.go
index 05494edf..2d29078e 100644
--- a/cmd/tools/cmd/cli/sscli.go
+++ b/cmd/tools/cmd/cli/sscli.go
@@ -25,15 +25,15 @@ import (
"os"
"time"
- // "juno/third_party/forked/golang/glog"
+ // "github.com/paypal/junodb/third_party/forked/golang/glog"
uuid "github.com/satori/go.uuid"
- "juno/internal/cli"
- "juno/pkg/client"
- "juno/pkg/cluster"
- "juno/pkg/cmd"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
const (
diff --git a/cmd/tools/cmd/insp/inspmsg.go b/cmd/tools/cmd/insp/inspmsg.go
index 94f742bc..97118dba 100644
--- a/cmd/tools/cmd/insp/inspmsg.go
+++ b/cmd/tools/cmd/insp/inspmsg.go
@@ -25,8 +25,8 @@ import (
"fmt"
"os"
- "juno/pkg/cmd"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/proto"
)
type cmdInspMsgT struct {
diff --git a/cmd/tools/cmd/insp/insprid.go b/cmd/tools/cmd/insp/insprid.go
index 95249a55..791744ad 100644
--- a/cmd/tools/cmd/insp/insprid.go
+++ b/cmd/tools/cmd/insp/insprid.go
@@ -26,10 +26,10 @@ import (
uuid "github.com/satori/go.uuid"
- "juno/pkg/cmd"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/cmd/tools/cmd/insp/ssgrp.go b/cmd/tools/cmd/insp/ssgrp.go
index 20bd047a..2d0bf48f 100644
--- a/cmd/tools/cmd/insp/ssgrp.go
+++ b/cmd/tools/cmd/insp/ssgrp.go
@@ -23,13 +23,13 @@ import (
"encoding/hex"
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- "juno/pkg/cluster"
- "juno/pkg/cmd"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/cmd/tools/cmd/stats/proxystats.go b/cmd/tools/cmd/stats/proxystats.go
index 4760dc82..92c13bd1 100644
--- a/cmd/tools/cmd/stats/proxystats.go
+++ b/cmd/tools/cmd/stats/proxystats.go
@@ -23,8 +23,8 @@ import (
"fmt"
"os"
- "juno/cmd/proxy/stats/shmstats"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/cmd/proxy/stats/shmstats"
+ "github.com/paypal/junodb/pkg/cmd"
)
var _ cmd.ICommand = (*CmdProxyStats)(nil)
diff --git a/cmd/tools/cmd/stats/storagestats.go b/cmd/tools/cmd/stats/storagestats.go
index 03ee76c2..5bfa84f3 100644
--- a/cmd/tools/cmd/stats/storagestats.go
+++ b/cmd/tools/cmd/stats/storagestats.go
@@ -23,8 +23,8 @@ import (
"fmt"
"os"
- "juno/cmd/storageserv/stats/shmstats"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/cmd/storageserv/stats/shmstats"
+ "github.com/paypal/junodb/pkg/cmd"
)
var _ cmd.ICommand = (*CmdStorageStats)(nil)
diff --git a/cmd/tools/goldendata/client.go b/cmd/tools/goldendata/client.go
index b66d2208..c0202423 100644
--- a/cmd/tools/goldendata/client.go
+++ b/cmd/tools/goldendata/client.go
@@ -25,10 +25,10 @@ import (
"strings"
"time"
- "juno/pkg/client"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/util"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type Duration = util.Duration
diff --git a/cmd/tools/goldendata/goldenset.go b/cmd/tools/goldendata/goldenset.go
index 22d74747..ef973579 100644
--- a/cmd/tools/goldendata/goldenset.go
+++ b/cmd/tools/goldendata/goldenset.go
@@ -21,7 +21,8 @@ package gld
import (
"fmt"
- "juno/pkg/util"
+
+ "github.com/paypal/junodb/pkg/util"
)
type KEY []byte
diff --git a/cmd/tools/goldendata/redistset.go b/cmd/tools/goldendata/redistset.go
index 6f80a52e..b81e79c5 100644
--- a/cmd/tools/goldendata/redistset.go
+++ b/cmd/tools/goldendata/redistset.go
@@ -21,9 +21,10 @@ package gld
import (
"fmt"
- "juno/pkg/util"
"strconv"
"strings"
+
+ "github.com/paypal/junodb/pkg/util"
)
type RedistSet struct {
diff --git a/cmd/tools/goldentool/goldentool.go b/cmd/tools/goldentool/goldentool.go
index ec957af0..b387f66f 100644
--- a/cmd/tools/goldentool/goldentool.go
+++ b/cmd/tools/goldentool/goldentool.go
@@ -25,8 +25,8 @@ import (
"os"
"path/filepath"
- "juno/cmd/tools/goldendata"
- "juno/third_party/forked/golang/glog"
+ gld "github.com/paypal/junodb/cmd/tools/goldendata"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func main() {
diff --git a/cmd/tools/junocfg/junocfg.go b/cmd/tools/junocfg/junocfg.go
index 2e5c440b..2fba125a 100644
--- a/cmd/tools/junocfg/junocfg.go
+++ b/cmd/tools/junocfg/junocfg.go
@@ -22,8 +22,8 @@ package main
import (
"fmt"
- "juno/cmd/tools/cmd/cfg"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/cmd/tools/cmd/cfg"
+ "github.com/paypal/junodb/pkg/cmd"
)
func main() {
diff --git a/cmd/tools/junocli/junocli.go b/cmd/tools/junocli/junocli.go
index fa972002..1d39cb50 100644
--- a/cmd/tools/junocli/junocli.go
+++ b/cmd/tools/junocli/junocli.go
@@ -22,11 +22,11 @@ package main
import (
"fmt"
- _ "juno/cmd/tools/cmd/cfg"
- _ "juno/cmd/tools/cmd/cli"
- _ "juno/cmd/tools/cmd/insp"
- "juno/pkg/cmd"
- "juno/pkg/logging/cal"
+ _ "github.com/paypal/junodb/cmd/tools/cmd/cfg"
+ _ "github.com/paypal/junodb/cmd/tools/cmd/cli"
+ _ "github.com/paypal/junodb/cmd/tools/cmd/insp"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/logging/cal"
)
func main() {
diff --git a/cmd/tools/junostats/junostats.go b/cmd/tools/junostats/junostats.go
index 0e19cc66..2b54b756 100644
--- a/cmd/tools/junostats/junostats.go
+++ b/cmd/tools/junostats/junostats.go
@@ -22,8 +22,8 @@ package main
import (
"fmt"
- "juno/cmd/tools/cmd/stats"
- "juno/pkg/cmd"
+ "github.com/paypal/junodb/cmd/tools/cmd/stats"
+ "github.com/paypal/junodb/pkg/cmd"
)
func main() {
diff --git a/docker/build.sh b/docker/build.sh
index c7c701e3..e8afd73a 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -57,7 +57,23 @@ make image_tag=${image_tag} docker_repo=${docker_repo} source_repo=${source_repo
# Set the app version using image_tag in manifest/.env
-sed -i "s#.*VERSION=.*#VERSION=${image_tag}#g" ${wd}/manifest/.env
+# Get the kernel name
+kernel=$(uname -s)
+
+# Set the sed command based on the operating system
+if [[ $kernel == "Linux" ]]; then
+ sed_command="sed -i 's#.*VERSION=.*#VERSION=${image_tag}#g' ${wd}/manifest/.env"
+elif [[ $kernel == "Darwin" ]]; then
+ sed_command="sed -i '' 's#.*VERSION=.*#VERSION=${image_tag}#g' ${wd}/manifest/.env"
+elif [[ $kernel == "CYGWIN"* || $kernel == "MINGW"* ]]; then
+ sed_command="sed -i 's#.*VERSION=.*#VERSION=${image_tag}#g' ${wd}/manifest/.env"
+else
+ echo "Unknown operating system."
+ exit 1
+fi
+
+# Run the sed command
+eval "$sed_command"
# Generate the test secrets to initialize proxy
manifest/config/secrets/gensecrets.sh
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 2aebfb69..7f3a9df9 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04 AS juno-base
+FROM ubuntu:20.04 AS juno-base
USER root
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
cmake \
diff --git a/docker/build/build.sh b/docker/build/build.sh
index 97efb62c..4e63cd6d 100755
--- a/docker/build/build.sh
+++ b/docker/build/build.sh
@@ -18,22 +18,24 @@
# limitations under the License.
#
+set -eo pipefail
+cd "$(dirname "$0")"
export CGO_CFLAGS="-I/usr/local/include"
export CGO_LDFLAGS="-L/usr/local/lib -lrocksdb -lstdc++ -lm -lrt -lpthread -ldl"
juno_executables="\
- juno/cmd/proxy \
- juno/cmd/storageserv \
- juno/cmd/clustermgr/clusterctl \
- juno/cmd/dbscanserv \
- juno/cmd/dbscanserv/junoctl \
- juno/cmd/tools/junostats \
- juno/cmd/tools/junocfg \
- juno/cmd/tools/junocli \
- juno/test/drv/junoload \
- juno/test/drv/bulkload \
- juno/cmd/storageserv/storage/db/dbcopy \
+ github.com/paypal/junodb/cmd/proxy \
+ github.com/paypal/junodb/cmd/storageserv \
+ github.com/paypal/junodb/cmd/clustermgr/clusterctl \
+ github.com/paypal/junodb/cmd/dbscanserv \
+ github.com/paypal/junodb/cmd/dbscanserv/junoctl \
+ github.com/paypal/junodb/cmd/tools/junostats \
+ github.com/paypal/junodb/cmd/tools/junocfg \
+ github.com/paypal/junodb/cmd/tools/junocli \
+ github.com/paypal/junodb/test/drv/junoload \
+ github.com/paypal/junodb/test/drv/bulkload \
+ github.com/paypal/junodb/cmd/storageserv/storage/db/dbcopy \
"
export PATH=/usr/local/go/bin:$PATH
diff --git a/docker/manifest/config/otel/config.yaml b/docker/manifest/config/otel/config.yaml
new file mode 100644
index 00000000..b5de724c
--- /dev/null
+++ b/docker/manifest/config/otel/config.yaml
@@ -0,0 +1,29 @@
+# connfig ref : https://opentelemetry.io/docs/collector/configuration/
+receivers:
+ otlp:
+ protocols:
+ http:
+ endpoint: "0.0.0.0:4318"
+
+
+exporters:
+ # Data sources: metrics
+ prometheus:
+ endpoint: "0.0.0.0:8889"
+ namespace: default
+ send_timestamps: true
+ metric_expiration: 180m
+ # resource_to_telemetry_conversion:
+ # enabled: true
+
+extensions:
+ health_check:
+ pprof:
+ zpages:
+
+service:
+ extensions: [health_check, pprof, zpages]
+ pipelines:
+ metrics:
+ receivers: [otlp]
+ exporters: [prometheus]
diff --git a/docker/manifest/config/prometheus/prometheus.yaml b/docker/manifest/config/prometheus/prometheus.yaml
new file mode 100644
index 00000000..cd1efea2
--- /dev/null
+++ b/docker/manifest/config/prometheus/prometheus.yaml
@@ -0,0 +1,6 @@
+scrape_configs:
+ - job_name: 'otel'
+ scrape_interval: 10s
+ static_configs:
+ - targets: ['otel:8888']
+ - targets: ['otel:8889']
diff --git a/docker/monitoring/docker-compose.yaml b/docker/monitoring/docker-compose.yaml
new file mode 100644
index 00000000..e0146bf0
--- /dev/null
+++ b/docker/monitoring/docker-compose.yaml
@@ -0,0 +1,41 @@
+version: "3"
+services:
+ otel-collector:
+ container_name: "otel-collector"
+ image: otel/opentelemetry-collector-contrib
+ restart: always
+ command:
+ - --config=/etc/otelcol-contrib/otel-config.yaml
+ volumes:
+ - ./otel-collector-config.yaml:/etc/otelcol-contrib/otel-config.yaml
+ ports:
+ - "1888:1888" # pprof extension
+ - "8888:8888" # Prometheus metrics exposed by the Collector
+ - "8889:8889" # Prometheus exporter metrics
+ - "13133:13133" # health_check extension
+ - "4317:4317" # OTLP gRPC receiver
+ - "4318:4318" # OTLP http receiver
+ - "55679:55679" # zpages extension
+
+ prometheus:
+ image: prom/prometheus
+ container_name: prometheus
+ restart: always
+ command:
+ - --config.file=/etc/prometheus/prometheus.yml
+ ports:
+ - "9090:9090"
+ volumes:
+ - ./prometheus.yml:/etc/prometheus/prometheus.yml
+ - prometheus-data:/prometheus
+
+ grafana:
+ container_name: grafana
+ image: grafana/grafana
+ volumes:
+ - ./grafana-datasources.yml:/etc/grafana/provisioning/datasources/datasources.yml
+ ports:
+ - "3000:3000"
+
+volumes:
+ prometheus-data:
diff --git a/docker/monitoring/grafana-datasources.yml b/docker/monitoring/grafana-datasources.yml
new file mode 100644
index 00000000..22b668e8
--- /dev/null
+++ b/docker/monitoring/grafana-datasources.yml
@@ -0,0 +1,15 @@
+apiVersion: 1
+
+datasources:
+ - name: Prometheus
+ type: prometheus
+ uid: prometheus
+ access: proxy
+ orgId: 1
+ url: http://prometheus:9090
+ basicAuth: false
+ isDefault: false
+ version: 1
+ editable: false
+ jsonData:
+ httpMethod: GET
diff --git a/docker/monitoring/otel-collector-config.yaml b/docker/monitoring/otel-collector-config.yaml
new file mode 100644
index 00000000..c0080ff9
--- /dev/null
+++ b/docker/monitoring/otel-collector-config.yaml
@@ -0,0 +1,32 @@
+receivers:
+ otlp:
+ protocols:
+ http:
+
+processors:
+ # batch metrics before sending to reduce API usage
+ batch:
+
+exporters:
+ prometheus:
+ endpoint: "0.0.0.0:8889"
+ const_labels:
+ label: juno
+
+
+# https://github.com/open-telemetry/opentelemetry-collector/blob/main/extension/README.md
+extensions:
+ # responsible for responding to health check calls on behalf of the collector.
+ health_check:
+ # fetches the collector’s performance data
+ pprof:
+ # serves as an http endpoint that provides live debugging data about instrumented components.
+ zpages:
+
+service:
+ extensions: [health_check, pprof, zpages]
+ pipelines:
+ metrics:
+ receivers: [otlp]
+ processors: [batch]
+ exporters: [prometheus]
diff --git a/docker/monitoring/prometheus.yml b/docker/monitoring/prometheus.yml
new file mode 100644
index 00000000..d543277a
--- /dev/null
+++ b/docker/monitoring/prometheus.yml
@@ -0,0 +1,12 @@
+global:
+ scrape_interval: 10s
+ evaluation_interval: 10s
+
+scrape_configs:
+ - job_name: 'otel-collector'
+ static_configs:
+ - targets: ['otel-collector:8889'] # Otlp
+ # uncomment to enable prometheus metrics
+ #- job_name: 'prometheus'
+ # static_configs:
+ # - targets: ['localhost:9090'] # Prometheus itself
diff --git a/docs/host_expansion.md b/docs/host_expansion.md
new file mode 100644
index 00000000..8425258c
--- /dev/null
+++ b/docs/host_expansion.md
@@ -0,0 +1,102 @@
+[](https://opensource.org/licenses/Apache-2.0)
+# Juno Host Expansion Instruction
+Juno is a high scalable and available distributed key value store. In Juno architecture, the whole storage space is partitioned into a fixed number (e.g. 1024) of logical shards, and shards are mapped to storage nodes within the cluster. When a cluster scaling out or scaling in (storage nodes are either added or removed to/from the cluster), some shards must be redistributed to different nodes to reflect new cluster topology. Following are the instuctions on how to expand(or shrink) the juno storageserv nodes.
+
+## Expand or Shrink Storage Host
+### Step0 (pre-requisite)
+Deploy juno storageserv (and or junoserv) to all new boxes
+
+junostorageserv on all the original boxes need to be up
+
+Pre-insert data to original cluster so it can be used for later validation(optional but suggested)
+
+Overall, the expansion contains below steps:
+```bash
+1. Markdown one zone at a time to stop incoming real time traffic to this zone
+2. Run command to update cluster topo to new cluster in etcd
+3. Start storageserv on new box for relavant zone.
+4. Run command to start redistribution
+ 4a. if requests failed to forward after serveral auto retry, run resume command to do redistribution again
+ 4b. if after 3a still some requests fail, restart source storageserv so the failed one can start forward again.
+5. Run command to commit if previous steps are all successful.
+```
+
+Loop through zone0 to zone5 to finish redistribution for all zones
+Retrieve pre-inserted data from storageserv for validation (optional)
+
+
+### Step1
+under junoclustercfg, run
+```bash
+ ./clustermgr --config config.toml --cmd zonemarkdown --type set -zone 0 (1,2,3,4)
+```
+verify markdown works by checking etcd cluster info (zonemarkdown flag added) and junostorageserv state log
+that no new request coming
+```bash
+--- etcd cluster info shows markdown flag is set ---
+run command "export ETCDCTL_API=3; ~/junoclusterserv/etcdctl --endpoints=: --prefix=true get "" | tail -8 "
+juno.junoserv_numzones
+3
+juno.junoserv_version
+1
+juno.junoserv_zonemarkdown (markdown flag is set for zone 0)
+0
+juno.root_junoserv
+2023-12-05 12:16:17|u20box|/home/deploy/junoclustercfg
+
+--- junostorageserv/state-logs/current shows the number of incoming requests(req) didn't change, i.e. no new traffic coming ---
+12-05 12:39:49 id free used req apt Read D C A RR keys LN compSec compCount pCompKB stall pCPU mCPU pMem mMem
+12-05 12:39:49 3-0 453110 42899 34267 98 3303 0 15482 0 0 4338 0 0 0 0 0 0.1 0.2 0.1 15.6
+12-05 12:39:50 3-0 453110 42899 34267 98 3303 0 15482 0 0 4338 0 0 0 0 0 0.1 0.2 0.1 15.6
+12-05 12:39:51 3-0 453110 42899 34267 98 3303 0 15482 0 0 4338 0 0 0 0 0 0.1 0.3 0.1 15.6
+```
+
+### Step2
+under junoclustercfg, run
+```bash
+ ./clustermgr -new_config config.toml_new -cmd redist -type prepare -zone 0 (1,2,3,4)
+```
+NOTE: A UI monitoring http link will be generated in redistserv.pid. It can be used for monitoring
+
+### Step3
+start junostorageserv on new box for relavant zone -- zone 0(1,2,3,4)
+
+### Step4
+under junoclustercfg, run
+```bash
+ ./clustermgr -new_config config.toml_new -ratelimit 5000 -cmd redist -type start_tgt --zone 0 (1,2,3,4)
+ ./clustermgr -new_config config.toml_new -ratelimit 5000 -cmd redist -type start_src --zone 0 (1,2,3,4)
+```
+NOTE: the ratelimit needs to be tuned for each different system. Depending on old/new cluster, the rate setting
+ will be different. For example,expansion from 5 to 10 boxes or expansion from 5 to 15 boxes, rate will be
+ different
+
+#### Step4a (only if requests forward final failed after several auto retry)
+under junoclustercfg, run
+```bash
+ ./clustermgr --new_config config.toml_new --cmd redist --type resume -ratelimit 5000 -zone 0(1,2,3,4)
+```
+
+#### Step4b (only if 4a still doesn't fix the failure)
+restart source storageserv and wait for redistribution complete
+
+### Step5
+under junoclustercfg, run
+```bash
+ ./clustermgr -new_config config.toml_new --cmd redist --type commit -zone 0(1,2,3,4)
+```
+Loop around zone0 to zone5 to complete all zones' redistribution
+
+## Validation (Optional but suggest)
+
+### Steps
+run juno client tool to get shard map which contains ss ip:port
+```bash
+ ./junocli ssgrp -c config.toml_new -hex=false key
+```
+
+run juno client tool to verify if key exists in the expected ss. ip:port is the one get from previoius command
+```bash
+ ./junocli read -s ip:port key
+```
+
diff --git a/docs/otel_mon.png b/docs/otel_mon.png
new file mode 100644
index 00000000..5fe3292a
Binary files /dev/null and b/docs/otel_mon.png differ
diff --git a/docs/otel_monitoring.md b/docs/otel_monitoring.md
new file mode 100644
index 00000000..6fc58b6c
--- /dev/null
+++ b/docs/otel_monitoring.md
@@ -0,0 +1,59 @@
+## Monitor Juno Metrics using Prometheus
+
+#### A simple setup to push the metrics on prometheus using otel-collector is shown below. Grafana can be further used to create visualizations from the available metrics.
+
+:9090 as shown below. Search for juno metrics.
+
+ 
+
+ #### Setup
+
+ ##### Configure proxy and storage to push metrics to otel endpoint
+
+- Juno proxy and storage services are configured to push the metrics on open telemetry collector endpoint http://localhost:4318/v1/metrics . Add/Update the [OTEL] section in the respective config.toml files
+
+```yaml
+[OTEL]
+ Enabled = true
+ Environment = "qa"
+ Host = "0.0.0.0"
+ Poolname = "junoserv-ai"
+ Port = 4318
+ Resolution = 10
+ UrlPath = "/v1/metrics"
+ UseTls = false
+
+```
+
+- Now the proxy and storage services are uploading metrics to otel endpoint.
+
+##### Set up otel-collector, prometheus and grafana
+- Open telemetry collector, prometheus and grafana are run as docker containers.
+- otel-collector , prometheus and grafana configurations are required to be mounted as volumes in the containers
+- docker-compose.yaml and configuration files for each of the services available in junodb/docker/monitoring
+
+
+```bash
+cd junodb/docker/monitoring
+
+docker compose up -d
+```
+
+- Check the running containers. prometheus, otel-collector and grafana should be running
+
+```bash
+CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
+bcb1e7ece6b7 prom/prometheus "/bin/prometheus --c…" 3 hours ago Up 3 hours 0.0.0.0:9090->9090/tcp prometheus
+c3816c006f85 otel/opentelemetry-collector-contrib "/otelcol-contrib --…" 3 hours ago Up 3 hours 0.0.0.0:1888->1888/tcp, 0.0.0.0:4317-4318->4317-4318/tcp, 0.0.0.0:8888-8889->8888-8889/tcp, 0.0.0.0:13133->13133/tcp, 0.0.0.0:55679->55679/tcp, 55678/tcp otel-collector
+e41e33696606 grafana/grafana "/run.sh" 3 hours ago Up 3 hours 0.0.0.0:3000->3000/tcp grafana
+
+```
+
+- Check the promethus server running at 
+
+
+
diff --git a/docs/prometheus.png b/docs/prometheus.png
new file mode 100644
index 00000000..d54cc18e
Binary files /dev/null and b/docs/prometheus.png differ
diff --git a/docs/swaphost.md b/docs/swaphost.md
new file mode 100644
index 00000000..6df77992
--- /dev/null
+++ b/docs/swaphost.md
@@ -0,0 +1,86 @@
+[](https://opensource.org/licenses/Apache-2.0)
+# Juno Host Swap Instruction
+Bad Juno nodes may have to be swapped out on a live cluster. The node that needs to be swapped can be running etcd (junoclusterserv), or juno storage or both. Following is a step-by-step guide to perform the swap.
+
+## Swapping a Storage Host
+### Step0 (optional)
+Pre-insert some data via junocli tool before host swap, after host swap, retrieve data and see if all data are able to be retrieved.
+
+### Step1
+Deploy junostorageserv (and or junoserv) on New_Host1, both services don't need to be start up, just deploy.
+update the junoclustercfg config.toml by changing old box into new box, make a package and deploy it to new box.
+
+```bash
+Old Config New Config
+SSHosts=[ SSHosts=[
+# Zone 0 # Zone 0
+[ [
+ "Host1" "New_Host1"
+], ],
+# Zone 1 # Zone 1
+[ [
+ "Host2" "Host2"
+], ],
+# Zone 2 # Zone 2
+[ [
+ "Host3" "Host3"
+],
+# Zone 3 # Zone 3
+[ [
+ "Host4" "Host4"
+], ],
+# Zone 4 # Zone 4
+[ [
+ "Host5" "Host5"
+] ]
+] ]
+```
+Make sure storageserv are up on all the boxes other than the bad box.
+
+### Step2
+If to be replaced box is a bad box, this step can be skipped. If to be replaced box is a good box, shutdown
+junostorageserv on to be replaced box, copy rocksdb_junostorageserv from it to new box on the same location.
+
+### Step3
+On the new box (the cluster config contains New_Host1), from junoclustercfg directory, run ./swaphost.sh.
+This step will bump up the junocluster config version in etcd and all the running junoserv and junostorageserv
+hosts will update their cluster map accordingly after script run.
+
+### Step4
+Start up junostorageserv (and or junoserv) on New_Host1. It will fetch the latest junoclustercfg from etcd.
+
+### Step5 (Optional)
+Validation - use junocli to retrieve pre-inserted data, all data should be able to retrieve.
+
+### Step6
+Once junoserv on New_Host1 works fine, if there is LB in front of junoserv, fix LB to replace Host1 with New_Host1
+
+Deploy the updated junoclustercfg package which contains New_Host1 to all the junoclustercfg boxes. All boxes have
+same version of junoclustercfg package after that.
+
+## Swapping host which has etcd server runs on
+The etcd cluster has three or five hosts depending on 3 quorum or 5 quorum - Host1^Host2^Host3^Host4^Host5
+
+Identify a new host (New_Host1) for the swap. Make sure etcd servers are up on all hosts except the bad one.
+Host1 is to be swapped with New_Host1
+
+### Step1
+Change the etcdsvr.txt under junoclusterserv
+```bash
+Old etcdsvr.txt New etcdsvr.txt
+[etcdsvr] [etcdsvr]
+initial_cluster = "Host1^Host2^Host3^Host4^Host5" initial_cluster = "New_Host1^Host2^Host3^Host4^Host5"
+```
+Build the junoclusterserv package and deploy to new box (New_Host1)
+
+### Step2
+On the old box (Host1), shutdown junoclusterserv by shutdown.sh under junoclusterserv
+
+On the new box(New_Host1), under junoclusterserv, first run join.sh, then run start.sh to have the new box
+join the members of quorum
+
+### Step3
+Deploy and start the new junoclusterserv package one by one to all other junoclusterserv boxes
+
+### Step4
+Fix LB of etcd to replace old Host1 with New_Host1.
diff --git a/go.mod b/go.mod
index b55c9d08..0c138506 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module juno
+module github.com/paypal/junodb
go 1.18
@@ -12,42 +12,42 @@ require (
github.com/satori/go.uuid v1.2.0
github.com/spaolacci/murmur3 v1.1.0
go.etcd.io/etcd/client/v3 v3.5.4
- go.opentelemetry.io/otel v1.11.2
- go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.34.0
- go.opentelemetry.io/otel/metric v0.34.0
- go.opentelemetry.io/otel/sdk v1.11.2
- go.opentelemetry.io/otel/sdk/metric v0.34.0
+ go.opentelemetry.io/otel v1.16.0
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0
+ go.opentelemetry.io/otel/metric v1.16.0
+ go.opentelemetry.io/otel/sdk v1.16.0
+ go.opentelemetry.io/otel/sdk/metric v0.39.0
go.opentelemetry.io/proto/otlp v0.19.0
- google.golang.org/protobuf v1.28.1
+ google.golang.org/protobuf v1.30.0
)
require (
- github.com/golang/protobuf v1.5.2 // indirect
- github.com/kr/pretty v0.3.0 // indirect
- github.com/rogpeppe/go-internal v1.6.2 // indirect
- golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
- golang.org/x/net v0.7.0 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
- github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
- github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+ github.com/kr/pretty v0.3.0 // indirect
+ github.com/rogpeppe/go-internal v1.6.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.34.0 // indirect
- go.opentelemetry.io/otel/trace v1.11.2 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
+ go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
- google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
- google.golang.org/grpc v1.51.0 // indirect
+ golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
+ golang.org/x/net v0.8.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/text v0.8.0 // indirect
+ google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+ google.golang.org/grpc v1.55.0 // indirect
+ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)
diff --git a/go.sum b/go.sum
index 3cd3cb01..f107fb29 100644
--- a/go.sum
+++ b/go.sum
@@ -50,8 +50,8 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -101,8 +101,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -112,8 +112,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
+github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -139,8 +139,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -248,7 +249,7 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -265,22 +266,22 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0=
-go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 h1:htgM8vZIF8oPSCxa341e3IZ4yr/sKxgu8KZYllByiVY=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2/go.mod h1:rqbht/LlhVBgn5+k3M5QK96K5Xb0DvXpMJ5SFQpY6uw=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.34.0 h1:kpskzLZ60cJ48SJ4uxWa6waBL+4kSV6nVK8rP+QM8Wg=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.34.0/go.mod h1:4+x3i62TEegDHuzNva0bMcAN8oUi5w4liGb1d/VgPYo=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.34.0 h1:t4Ajxj8JGjxkqoBtbkCOY2cDUl9RwiNE9LPQavooi9U=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.34.0/go.mod h1:WO7omosl4P7JoanH9NgInxDxEn2F2M5YinIh8EyeT8w=
-go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8=
-go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8=
-go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU=
-go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU=
-go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo=
-go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ=
-go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0=
-go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA=
+go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
+go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0=
+go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 h1:IZXpCEtI7BbX01DRQEWTGDkvjMB6hEhiEZXS+eg2YqY=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o=
+go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
+go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
+go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
+go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
+go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
+go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
+go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
+go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw=
go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
@@ -369,8 +370,8 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -426,8 +427,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -435,8 +436,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -486,7 +487,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -549,8 +550,9 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 h1:b9mVrqYfq3P4bCdaLg1qtBnPzUYgglsIdjZkL/fQVOE=
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -568,8 +570,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
+google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
+google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -583,8 +585,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/internal/cli/ctx.go b/internal/cli/ctx.go
index 022dbfd5..56965d87 100644
--- a/internal/cli/ctx.go
+++ b/internal/cli/ctx.go
@@ -20,9 +20,9 @@
package cli
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
//GetResponse() != nil and GetError() != nil are mutually exclusive
diff --git a/internal/cli/proc.go b/internal/cli/proc.go
index 5a4719ce..d67c13b9 100644
--- a/internal/cli/proc.go
+++ b/internal/cli/proc.go
@@ -26,11 +26,11 @@ import (
"syscall"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- junoio "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/util"
+ junoio "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/internal/cli/processor.go b/internal/cli/processor.go
index be505974..cb7ee3ad 100644
--- a/internal/cli/processor.go
+++ b/internal/cli/processor.go
@@ -25,12 +25,12 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
type IOError struct {
diff --git a/internal/cli/recinfo.go b/internal/cli/recinfo.go
index 6e3a752e..728bfb42 100644
--- a/internal/cli/recinfo.go
+++ b/internal/cli/recinfo.go
@@ -22,7 +22,7 @@ package cli
import (
"fmt"
"io"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
type RecordInfo struct {
diff --git a/internal/cli/tracker.go b/internal/cli/tracker.go
index 54a30021..28af2b13 100644
--- a/internal/cli/tracker.go
+++ b/internal/cli/tracker.go
@@ -23,9 +23,9 @@ import (
"fmt"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
type PendingRequest struct {
diff --git a/pkg/cfg/cfg.go b/pkg/cfg/cfg.go
index fb2eb5f1..fdaeca59 100644
--- a/pkg/cfg/cfg.go
+++ b/pkg/cfg/cfg.go
@@ -29,7 +29,7 @@ import (
"github.com/BurntSushi/toml"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type (
diff --git a/pkg/client/clientimpl.go b/pkg/client/clientimpl.go
index 0648fd65..7ab57804 100644
--- a/pkg/client/clientimpl.go
+++ b/pkg/client/clientimpl.go
@@ -17,20 +17,22 @@
// limitations under the License.
//
+// Package client provides interfaces and implementations for communicating with a Juno server.
package client
import (
"fmt"
"runtime"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/internal/cli"
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
)
+// clientImplT is the default implementation of the IClient interface.
type clientImplT struct {
config Config
appName string
@@ -38,6 +40,7 @@ type clientImplT struct {
processor *cli.Processor
}
+// newProcessorWithConfig initializes a new Processor with the given configuration.
func newProcessorWithConfig(conf *Config) *cli.Processor {
if conf == nil {
return nil
@@ -51,6 +54,7 @@ func newProcessorWithConfig(conf *Config) *cli.Processor {
return c
}
+// New initializes a new IClient with the given configuration. Returns an error if configuration validation fails.
func New(conf Config) (IClient, error) {
if err := conf.validate(); err != nil {
return nil, err
@@ -68,6 +72,7 @@ func New(conf Config) (IClient, error) {
return client, nil
}
+// NewClient initializes a new IClient with the provided server address, namespace and app name.
func NewClient(server string, ns string, app string) (IClient, error) {
c := &clientImplT{
config: Config{
@@ -99,6 +104,8 @@ func NewClient(server string, ns string, app string) (IClient, error) {
}
///TODO to revisit
+
+// Close closes the client and cleans up resources.
func (c *clientImplT) Close() {
if c.processor != nil {
c.processor.Close()
@@ -106,6 +113,7 @@ func (c *clientImplT) Close() {
}
}
+// getOptions collects all provided options into an optionData object.
func (c *clientImplT) getOptions(opts ...IOption) *optionData {
data := &optionData{}
for _, op := range opts {
@@ -114,12 +122,14 @@ func (c *clientImplT) getOptions(opts ...IOption) *optionData {
return data
}
+// newContext creates a new context from the provided operational message.
func newContext(resp *proto.OperationalMessage) IContext {
recInfo := &cli.RecordInfo{}
recInfo.SetFromOpMsg(resp)
return recInfo
}
+// Create sends a Create operation request to the server.
func (c *clientImplT) Create(key []byte, value []byte, opts ...IOption) (context IContext, err error) {
glog.Verbosef("Create ")
var resp *proto.OperationalMessage
@@ -138,6 +148,7 @@ func (c *clientImplT) Create(key []byte, value []byte, opts ...IOption) (context
return
}
+// Get sends a Get operation request to the server.
func (c *clientImplT) Get(key []byte, opts ...IOption) (value []byte, context IContext, err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -161,6 +172,7 @@ func (c *clientImplT) Get(key []byte, opts ...IOption) (value []byte, context IC
return
}
+// Update sends an Update operation request to the server.
func (c *clientImplT) Update(key []byte, value []byte, opts ...IOption) (context IContext, err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -183,6 +195,7 @@ func (c *clientImplT) Update(key []byte, value []byte, opts ...IOption) (context
return
}
+// Set sends a Set operation request to the server.
func (c *clientImplT) Set(key []byte, value []byte, opts ...IOption) (context IContext, err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -200,6 +213,7 @@ func (c *clientImplT) Set(key []byte, value []byte, opts ...IOption) (context IC
return
}
+// Destroy sends a Destroy operation request to the server.
func (c *clientImplT) Destroy(key []byte, opts ...IOption) (err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -215,6 +229,7 @@ func (c *clientImplT) Destroy(key []byte, opts ...IOption) (err error) {
return
}
+// UDFGet sends a UDFGet operation request to the server.
func (c *clientImplT) UDFGet(key []byte, fname []byte, params []byte, opts ...IOption) (value []byte, context IContext, err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -239,6 +254,7 @@ func (c *clientImplT) UDFGet(key []byte, fname []byte, params []byte, opts ...IO
return
}
+// UDFSet sends a UDFSet operation request to the server.
func (c *clientImplT) UDFSet(key []byte, fname []byte, params []byte, opts ...IOption) (context IContext, err error) {
var resp *proto.OperationalMessage
options := newOptionData(opts...)
@@ -258,10 +274,13 @@ func (c *clientImplT) UDFSet(key []byte, fname []byte, params []byte, opts ...IO
}
///TODO temporary
+
+// Batch sends a batch of operation requests to the server.
func (c *clientImplT) Batch(requests []*proto.OperationalMessage) (responses []*proto.OperationalMessage, err error) {
return c.processor.ProcessBatchRequests(requests)
}
+// NewRequest creates a new OperationalMessage with the provided parameters.
func (c *clientImplT) NewRequest(op proto.OpCode, key []byte, value []byte, ttl uint32) (request *proto.OperationalMessage) {
///TODO: validate op
request = &proto.OperationalMessage{}
@@ -272,6 +291,7 @@ func (c *clientImplT) NewRequest(op proto.OpCode, key []byte, value []byte, ttl
return
}
+// NewUDFRequest creates a new UDF OperationalMessage with the provided parameters.
func (c *clientImplT) NewUDFRequest(op proto.OpCode, key []byte, fname []byte, params []byte, ttl uint32) (request *proto.OperationalMessage) {
///TODO: validate op
request = &proto.OperationalMessage{}
@@ -284,6 +304,7 @@ func (c *clientImplT) NewUDFRequest(op proto.OpCode, key []byte, fname []byte, p
return
}
+// checkResponse validates the response from the server against the original request.
func checkResponse(request *proto.OperationalMessage, response *proto.OperationalMessage, recInfo *cli.RecordInfo) (err error) {
opCode := request.GetOpCode()
if opCode != response.GetOpCode() {
diff --git a/pkg/client/config.go b/pkg/client/config.go
index 22a4d90e..860cf076 100644
--- a/pkg/client/config.go
+++ b/pkg/client/config.go
@@ -1,47 +1,49 @@
+// Copyright 2023 PayPal Inc.
//
-// Copyright 2023 PayPal Inc.
-//
-// 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
+// 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.
-//
+// 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 client handles the configuration for a Juno client.
package client
import (
"fmt"
"time"
- "juno/pkg/io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
)
+// Duration is a type alias for util.Duration.
type Duration = util.Duration
+// Config holds the configuration values for the Juno client.
type Config struct {
- Server io.ServiceEndpoint
- Appname string
- Namespace string
- RetryCount int
- DefaultTimeToLive int
- ConnectTimeout Duration
- ReadTimeout Duration
- WriteTimeout Duration
- RequestTimeout Duration
- ConnRecycleTimeout Duration
+ Server io.ServiceEndpoint // Server defines the ServiceEndpoint of the Juno server.
+ Appname string // Appname is the name of the application.
+ Namespace string // Namespace is the namespace of the application.
+ RetryCount int // RetryCount is the maximum number of retries.
+ DefaultTimeToLive int // DefaultTimeToLive is the default TTL (time to live) for requests.
+ ConnectTimeout Duration // ConnectTimeout is the timeout for establishing connections.
+ ReadTimeout Duration // ReadTimeout is the timeout for read operations.
+ WriteTimeout Duration // WriteTimeout is the timeout for write operations.
+ RequestTimeout Duration // RequestTimeout is the timeout for each request.
+ ConnRecycleTimeout Duration // ConnRecycleTimeout is the timeout for connection recycling.
}
+// defaultConfig defines the default configuration values.
var defaultConfig = Config{
RetryCount: 1,
DefaultTimeToLive: 1800,
@@ -52,10 +54,12 @@ var defaultConfig = Config{
ConnRecycleTimeout: Duration{9 * time.Second},
}
+// SetDefaultTimeToLive sets the default time to live (TTL) for the configuration.
func SetDefaultTimeToLive(ttl int) {
defaultConfig.DefaultTimeToLive = ttl
}
+// SetDefaultTimeout sets the default timeout durations for the configuration.
func SetDefaultTimeout(connect, read, write, request, connRecycle time.Duration) {
defaultConfig.ConnectTimeout.Duration = connect
defaultConfig.ReadTimeout.Duration = read
@@ -64,10 +68,14 @@ func SetDefaultTimeout(connect, read, write, request, connRecycle time.Duration)
defaultConfig.ConnRecycleTimeout.Duration = connRecycle
}
+// SetDefault updates the current Config to match the default Config.
func (c *Config) SetDefault() {
*c = defaultConfig
}
+// validate checks if the required fields of the Config are correctly populated.
+// It validates the Server field and checks if Appname and Namespace are specified.
+// It returns an error if any of the above conditions are not met.
func (c *Config) validate() error {
if err := c.Server.Validate(); err != nil {
return err
@@ -78,6 +86,6 @@ func (c *Config) validate() error {
if len(c.Namespace) == 0 {
return fmt.Errorf("Config.Namespace not specified.")
}
- /// TODO to validate others
+ // TODO to validate others
return nil
}
diff --git a/pkg/client/error.go b/pkg/client/error.go
index 18c7332b..5dd6991f 100644
--- a/pkg/client/error.go
+++ b/pkg/client/error.go
@@ -17,61 +17,66 @@
// limitations under the License.
//
+// client is a package that handles various error situations in the Juno application.
package client
import (
- "juno/internal/cli"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/proto"
)
+// Error variables for different scenarios in the application.
var (
- ErrNoKey error
- ErrUniqueKeyViolation error
- ErrBadParam error
- ErrConditionViolation error
+ ErrNoKey error // Error when no key is found.
+ ErrUniqueKeyViolation error // Error when there is a violation of a unique key.
+ ErrBadParam error // Error when a bad parameter is provided.
+ ErrConditionViolation error // Error when a condition violation occurs.
- ErrBadMsg error
- ErrNoStorage error
- ErrRecordLocked error
- ErrTTLExtendFailure error
- ErrBusy error
+ ErrBadMsg error // Error when a bad message is encountered.
+ ErrNoStorage error // Error when no storage is available.
+ ErrRecordLocked error // Error when a record is locked.
+ ErrTTLExtendFailure error // Error when TTL extension fails.
+ ErrBusy error // Error when the server is busy.
- ErrWriteFailure error
- ErrInternal error
- ErrOpNotSupported error
+ ErrWriteFailure error // Error when a write operation fails.
+ ErrInternal error // Error when an internal problem occurs.
+ ErrOpNotSupported error // Error when the operation is not supported.
)
+// errorMapping is a map between different operation status and their corresponding errors.
var errorMapping map[proto.OpStatus]error
+// init function initializes the error variables and the errorMapping map.
func init() {
- ErrNoKey = &cli.Error{"no key"}
- ErrUniqueKeyViolation = &cli.Error{"unique key violation"}
- ErrBadParam = &cli.Error{"bad parameter"}
- ErrConditionViolation = &cli.Error{"condition violation"} //version too old
- ErrTTLExtendFailure = &cli.Error{"fail to extend TTL"}
+ ErrNoKey = &cli.Error{"no key"} // Error when the key does not exist.
+ ErrUniqueKeyViolation = &cli.Error{"unique key violation"} // Error when unique key constraint is violated.
+ ErrBadParam = &cli.Error{"bad parameter"} // Error when a bad parameter is passed.
+ ErrConditionViolation = &cli.Error{"condition violation"} // Error when there is a condition violation.
+ ErrTTLExtendFailure = &cli.Error{"fail to extend TTL"} // Error when TTL extension fails.
- ErrBadMsg = &cli.RetryableError{"bad message"}
- ErrNoStorage = &cli.RetryableError{"no storage"}
- ErrRecordLocked = &cli.RetryableError{"record locked"}
- ErrBusy = &cli.RetryableError{"server busy"}
+ ErrBadMsg = &cli.RetryableError{"bad message"} // Error when an inappropriate message is received.
+ ErrNoStorage = &cli.RetryableError{"no storage"} // Error when there is no storage available.
+ ErrRecordLocked = &cli.RetryableError{"record locked"} // Error when a record is locked.
+ ErrBusy = &cli.RetryableError{"server busy"} // Error when the server is busy.
- ErrWriteFailure = &cli.Error{"write failure"}
- ErrInternal = &cli.Error{"internal error"}
- ErrOpNotSupported = &cli.Error{"Op not supported"}
+ ErrWriteFailure = &cli.Error{"write failure"} // Error when a write operation fails.
+ ErrInternal = &cli.Error{"internal error"} // Error when an internal error occurs.
+ ErrOpNotSupported = &cli.Error{"Op not supported"} // Error when the operation is not supported.
+ // Mapping between the operation status and the corresponding errors.
errorMapping = map[proto.OpStatus]error{
- proto.OpStatusNoError: nil,
- proto.OpStatusInconsistent: nil,
- proto.OpStatusBadMsg: ErrBadMsg,
- proto.OpStatusNoKey: ErrNoKey,
- proto.OpStatusDupKey: ErrUniqueKeyViolation,
- proto.OpStatusNoStorageServer: ErrNoStorage,
- proto.OpStatusBadParam: ErrBadParam,
- proto.OpStatusRecordLocked: ErrRecordLocked,
- proto.OpStatusVersionConflict: ErrConditionViolation,
- proto.OpStatusSSReadTTLExtendErr: ErrTTLExtendFailure,
- proto.OpStatusCommitFailure: ErrWriteFailure,
- proto.OpStatusBusy: ErrBusy,
- proto.OpStatusNotSupported: ErrOpNotSupported,
+ proto.OpStatusNoError: nil, // Status when there is no error.
+ proto.OpStatusInconsistent: nil, // Status when there is an inconsistency.
+ proto.OpStatusBadMsg: ErrBadMsg, // Status when a bad message is received.
+ proto.OpStatusNoKey: ErrNoKey, // Status when the key is not present.
+ proto.OpStatusDupKey: ErrUniqueKeyViolation, // Status when unique key constraint is violated.
+ proto.OpStatusNoStorageServer: ErrNoStorage, // Status when there is no storage server available.
+ proto.OpStatusBadParam: ErrBadParam, // Status when a bad parameter is passed.
+ proto.OpStatusRecordLocked: ErrRecordLocked, // Status when a record is locked.
+ proto.OpStatusVersionConflict: ErrConditionViolation, // Status when there is a version conflict.
+ proto.OpStatusSSReadTTLExtendErr: ErrTTLExtendFailure, // Status when TTL extension fails.
+ proto.OpStatusCommitFailure: ErrWriteFailure, // Status when a commit operation fails.
+ proto.OpStatusBusy: ErrBusy, // Status when the server is busy.
+ proto.OpStatusNotSupported: ErrOpNotSupported, // Status when the operation is not supported.
}
}
diff --git a/pkg/client/example_test.go b/pkg/client/example_test.go
index ebb7a991..2e1a8985 100644
--- a/pkg/client/example_test.go
+++ b/pkg/client/example_test.go
@@ -22,7 +22,7 @@ package client_test
import (
"fmt"
- "juno/pkg/client"
+ "github.com/paypal/junodb/pkg/client"
)
func Example_config() {
diff --git a/pkg/client/option.go b/pkg/client/option.go
index 849400b2..2e77f42c 100644
--- a/pkg/client/option.go
+++ b/pkg/client/option.go
@@ -17,16 +17,19 @@
// limitations under the License.
//
+// Package client provides functionalities for client configurations.
package client
import ()
+// optionData struct contains client options.
type optionData struct {
- ttl uint32
- context IContext
- correlationId string
+ ttl uint32 // Time to live value.
+ context IContext // Client context.
+ correlationId string // Correlation ID for tracking.
}
+// IOption type represents a function that applies options on optionData.
//type IOption interface {
// Apply(data *optionData) error
//}
@@ -46,34 +49,41 @@ type optionData struct {
type IOption func(data interface{})
+// WithTTL function returns an IOption that sets a TTL value.
func WithTTL(ttl uint32) IOption {
return func(i interface{}) {
+ // Check if the passed interface can be casted to *optionData
if data, ok := i.(*optionData); ok {
- data.ttl = ttl
+ data.ttl = ttl // Set the TTL value.
}
}
}
+// WithCond function returns an IOption that sets a context.
func WithCond(context IContext) IOption {
return func(i interface{}) {
+ // Check if the passed interface can be casted to *optionData
if data, ok := i.(*optionData); ok {
- data.context = context
+ data.context = context // Set the context.
}
}
}
+// WithCorrelationId function returns an IOption that sets a correlationId.
func WithCorrelationId(id string) IOption {
return func(i interface{}) {
+ // Check if the passed interface can be casted to *optionData
if data, ok := i.(*optionData); ok {
- data.correlationId = id
+ data.correlationId = id // Set the correlation ID.
}
}
}
+// newOptionData function applies the options passed in and returns an initialized optionData.
func newOptionData(opts ...IOption) *optionData {
- data := &optionData{}
+ data := &optionData{} // Initialize a new optionData.
for _, op := range opts {
- op(data)
+ op(data) // Apply each option on the optionData.
}
- return data
+ return data // Return the initialized optionData.
}
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 3b0827d7..57087fbe 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -32,7 +32,7 @@ import (
"syscall"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
)
diff --git a/pkg/cluster/clusterstats.go b/pkg/cluster/clusterstats.go
index 804c5134..058c4209 100644
--- a/pkg/cluster/clusterstats.go
+++ b/pkg/cluster/clusterstats.go
@@ -21,11 +21,13 @@ package cluster
import (
"fmt"
+ "strings"
"sync"
"time"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging/otel"
- "juno/pkg/util"
- "juno/third_party/forked/golang/glog"
)
type ProcStat struct {
@@ -180,6 +182,8 @@ func (c *ClusterStats) processStateChange(st *ProcStat) {
c.MarkdownTable[idx] = true
glog.Infof("markdown: node %d-%d, exp:%d, timout ct: %d",
st.zoneid, st.nodeid, c.MarkdownExpiration[idx], timeoutCnt)
+ targetSS := getIP(st.zoneid, st.nodeid)
+ otel.RecordCount(otel.SoftMark, []otel.Tags{{otel.Target, targetSS}, {otel.Status, otel.SSMarkDown}})
}
}
@@ -194,6 +198,20 @@ func (c *ClusterStats) processStateChange(st *ProcStat) {
}
}
+func getIP(zoneid uint32, nodeid uint32) string {
+ shardMgr := GetShardMgr()
+ // First check if the connInfo has the element.
+ if len(shardMgr.connInfo) < int(zoneid+1) || len(shardMgr.connInfo[zoneid]) < int(nodeid+1) {
+ return ""
+ }
+ i := strings.Index(shardMgr.connInfo[zoneid][nodeid], ":")
+
+ if i < 0 {
+ return shardMgr.connInfo[zoneid][nodeid]
+ }
+ return shardMgr.connInfo[zoneid][nodeid][:i]
+}
+
// Naive way of doing markup: markdown expired.
// Potentially can add probe logic so that we markup only if it's in good state.
func (c *ClusterStats) markup() {
@@ -215,6 +233,8 @@ func (c *ClusterStats) markup() {
glog.Infof("markup: host %d-%d", i, j)
c.MarkdownExpiration[idx] = 0
c.MarkdownTable[idx] = false
+ targetSS := getIP(i, j)
+ otel.RecordCount(otel.SoftMark, []otel.Tags{{otel.Target, targetSS}, {otel.Status, otel.SSMarkUp}})
}
}
}
diff --git a/pkg/cluster/lock_linux.go b/pkg/cluster/lock_linux.go
index e9188f3d..2c541515 100644
--- a/pkg/cluster/lock_linux.go
+++ b/pkg/cluster/lock_linux.go
@@ -20,8 +20,9 @@
package cluster
import (
- "juno/third_party/forked/golang/glog"
"syscall"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func lockFile(fd int, mode int) bool {
diff --git a/pkg/cluster/node.go b/pkg/cluster/node.go
index 5451ce86..d9ed0c6c 100644
--- a/pkg/cluster/node.go
+++ b/pkg/cluster/node.go
@@ -26,7 +26,7 @@ import (
"strconv"
"strings"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// Node class represent a logic node
diff --git a/pkg/cluster/shardmgr.go b/pkg/cluster/shardmgr.go
index 1d578316..78fa381b 100644
--- a/pkg/cluster/shardmgr.go
+++ b/pkg/cluster/shardmgr.go
@@ -28,14 +28,14 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/pkg/io"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/shard"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/util"
)
var (
@@ -338,8 +338,8 @@ func (p *ShardManager) GetSSProcessor(zoneId int, nodeId int) *OutboundSSProcess
return p.processors[zoneId][nodeId]
}
-//used by request processor
-//the caller's responsibility to make sure
+// used by request processor
+// the caller's responsibility to make sure
// cap(procs) >= numZones and cap(pos) >= numZones
func (p *ShardManager) GetSSProcessors(key []byte, confNumWrites int, procs []*OutboundSSProcessor, pos []int) (shardId shard.ID, numProcs int) {
@@ -759,9 +759,9 @@ func (p *OutboundSSProcessor) GetNodeInfo() (zoneid int, hostid int) {
}
func (p *OutboundSSProcessor) OnConnectSuccess(conn io.Conn, connector *io.OutboundConnector, timeTaken time.Duration) {
+ netConn := conn.GetNetConn()
if cal.IsEnabled() {
b := logging.NewKVBuffer()
- netConn := conn.GetNetConn()
b.Add([]byte("raddr"), netConn.RemoteAddr().String())
b.Add([]byte("laddr"), netConn.LocalAddr().String())
@@ -771,10 +771,9 @@ func (p *OutboundSSProcessor) OnConnectSuccess(conn io.Conn, connector *io.Outbo
cal.AtomicTransaction(logging.CalMsgTypeSSConnect, p.Name(), cal.StatusSuccess, timeTaken, b.Bytes())
}
- if otel.IsEnabled() {
- netConn := conn.GetNetConn()
- otel.RecordSSConnection(netConn.RemoteAddr().String(), otel.StatusSuccess, timeTaken.Milliseconds())
- }
+
+ otel.RecordSSConnection(getIPAddress(netConn.RemoteAddr().String()), otel.StatusSuccess, timeTaken.Microseconds())
+
}
func (p *OutboundSSProcessor) OnConnectError(timeTaken time.Duration, connStr string, err error) {
@@ -784,9 +783,14 @@ func (p *OutboundSSProcessor) OnConnectError(timeTaken time.Duration, connStr st
b.Add([]byte("err"), err.Error())
cal.AtomicTransaction(logging.CalMsgTypeSSConnectError, p.Name(), cal.StatusSuccess, timeTaken, b.Bytes())
}
- if otel.IsEnabled() {
- otel.RecordSSConnection(connStr, otel.StatusError, timeTaken.Milliseconds())
- }
+
+ otel.RecordSSConnection(getIPAddress(connStr), otel.StatusError, timeTaken.Microseconds())
+
+}
+
+func getIPAddress(endpoint string) string {
+ s := strings.Split(endpoint, ":")
+ return s[0]
}
func (m *ZoneMarkDown) MarkDown(zoneid int32) {
diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go
index 50f3220d..50c9f0cb 100644
--- a/pkg/cluster/util.go
+++ b/pkg/cluster/util.go
@@ -22,7 +22,7 @@ package cluster
import (
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func DisplayZones(zones []*Zone, header string) {
diff --git a/pkg/cluster/zone.go b/pkg/cluster/zone.go
index 0de13647..7fa97aca 100644
--- a/pkg/cluster/zone.go
+++ b/pkg/cluster/zone.go
@@ -23,7 +23,7 @@ import (
"fmt"
"sort"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// Node class represent a logic node
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
index 2859cb76..aa405968 100644
--- a/pkg/cmd/cmd.go
+++ b/pkg/cmd/cmd.go
@@ -30,9 +30,9 @@ import (
"strings"
"text/tabwriter"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/version"
)
var (
diff --git a/pkg/etcd/config.go b/pkg/etcd/config.go
index a89f4c62..0aea1c02 100644
--- a/pkg/etcd/config.go
+++ b/pkg/etcd/config.go
@@ -24,7 +24,7 @@ import (
clientv3 "go.etcd.io/etcd/client/v3"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index 8fdd8d19..65e0d1d6 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -21,8 +21,9 @@ package etcd
import (
"errors"
- "juno/third_party/forked/golang/glog"
"sync"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/pkg/etcd/etcdclient.go b/pkg/etcd/etcdclient.go
index 770c7de2..26c873b4 100644
--- a/pkg/etcd/etcdclient.go
+++ b/pkg/etcd/etcdclient.go
@@ -32,7 +32,7 @@ import (
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/pkg/etcd/etcdreader.go b/pkg/etcd/etcdreader.go
index 00cead95..93bb0db9 100644
--- a/pkg/etcd/etcdreader.go
+++ b/pkg/etcd/etcdreader.go
@@ -28,11 +28,11 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cluster"
- "juno/pkg/shard"
- "juno/pkg/stats/redist"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/shard"
+ "github.com/paypal/junodb/pkg/stats/redist"
)
// Implements cluster.IReader
diff --git a/pkg/etcd/etcdwriter.go b/pkg/etcd/etcdwriter.go
index 5bf10b10..d9a963c2 100644
--- a/pkg/etcd/etcdwriter.go
+++ b/pkg/etcd/etcdwriter.go
@@ -25,9 +25,9 @@ import (
"strconv"
"strings"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/cluster"
+ "github.com/paypal/junodb/pkg/cluster"
)
type IKVWriter interface {
diff --git a/pkg/initmgr/init.go b/pkg/initmgr/init.go
index 01092d9b..1818b276 100644
--- a/pkg/initmgr/init.go
+++ b/pkg/initmgr/init.go
@@ -32,8 +32,8 @@ import (
"syscall"
"time"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
)
var (
diff --git a/pkg/io/conn.go b/pkg/io/conn.go
index 226810f8..e5f98eb3 100644
--- a/pkg/io/conn.go
+++ b/pkg/io/conn.go
@@ -24,16 +24,19 @@ import (
"net"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/sec"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/sec"
)
type Conn interface {
GetStateString() string
+ GetTLSVersion() string
+ GetCipherName() string
+ DidResume() string
GetNetConn() net.Conn
IsTLS() bool
}
@@ -51,6 +54,17 @@ func (c *Connection) GetStateString() string {
return ""
}
+func (c *Connection) GetTLSVersion() string {
+ return ""
+}
+
+func (c *Connection) GetCipherName() string {
+ return ""
+}
+
+func (c *Connection) DidResume() string {
+ return ""
+}
func (c *Connection) GetNetConn() net.Conn {
return c.conn
}
@@ -91,13 +105,15 @@ func Connect(endpoint *ServiceEndpoint, connectTimeout time.Duration) (conn net.
cal.AtomicTransaction(cal.TxnTypeConnect, endpoint.Addr, status, time.Since(timeStart), b.Bytes())
}
}
- if otel.IsEnabled() {
- status := otel.StatusSuccess
- if err != nil {
- status = otel.StatusError
- }
- otel.RecordOutboundConnection(endpoint.Addr, status, time.Since(timeStart).Milliseconds())
+ status := otel.StatusSuccess
+
+ if err != nil {
+ status = otel.StatusError
+ } else {
+ otel.RecordCount(otel.TLSStatus, []otel.Tags{{otel.Endpoint, endpoint.Addr}, {otel.TLS_version, sslconn.GetTLSVersion()},
+ {otel.Cipher, sslconn.GetCipherName()}, {otel.Ssl_r, sslconn.DidResume()}})
}
+ otel.RecordOutboundConnection(endpoint.Addr, status, time.Since(timeStart).Microseconds())
} else {
if conn, err = net.DialTimeout("tcp", endpoint.Addr, connectTimeout); err == nil {
if glog.LOG_DEBUG {
@@ -115,13 +131,11 @@ func Connect(endpoint *ServiceEndpoint, connectTimeout time.Duration) (conn net.
}
cal.AtomicTransaction(cal.TxnTypeConnect, endpoint.GetConnString(), status, time.Since(timeStart), data)
}
- if otel.IsEnabled() {
- status := otel.StatusSuccess
- if err != nil {
- status = otel.StatusError
- }
- otel.RecordOutboundConnection(endpoint.GetConnString(), status, time.Since(timeStart).Milliseconds())
+ status := otel.StatusSuccess
+ if err != nil {
+ status = otel.StatusError
}
+ otel.RecordOutboundConnection(endpoint.GetConnString(), status, time.Since(timeStart).Microseconds())
}
return
diff --git a/pkg/io/connmgr.go b/pkg/io/connmgr.go
index f44f1c6a..c2250841 100644
--- a/pkg/io/connmgr.go
+++ b/pkg/io/connmgr.go
@@ -23,7 +23,7 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type InboundConnManager struct {
diff --git a/pkg/io/inboundconnector.go b/pkg/io/inboundconnector.go
index bfc8a862..bc477cd0 100644
--- a/pkg/io/inboundconnector.go
+++ b/pkg/io/inboundconnector.go
@@ -29,13 +29,13 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/pkg/debug"
- "juno/pkg/io/ioutil"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/io/ioutil"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/pkg/logging/otel"
)
type Connector struct {
@@ -83,6 +83,7 @@ func (c *Connector) Close() {
cal.Event(cal.TxnTypeClose, rhost, cal.StatusSuccess, []byte(addr))
}
}
+ otel.RecordCount(otel.Close, []otel.Tags{})
c.cancelCtx()
})
}
diff --git a/pkg/io/ioconfig.go b/pkg/io/ioconfig.go
index 107b8253..6aae8148 100644
--- a/pkg/io/ioconfig.go
+++ b/pkg/io/ioconfig.go
@@ -22,7 +22,7 @@ package io
import (
"time"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/pkg/io/ioutil/logerr.go b/pkg/io/ioutil/logerr.go
index 5af8f8f5..63568e48 100644
--- a/pkg/io/ioutil/logerr.go
+++ b/pkg/io/ioutil/logerr.go
@@ -25,7 +25,7 @@ import (
"os"
"syscall"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func LogError(err error) {
diff --git a/pkg/io/listener.go b/pkg/io/listener.go
index c93f3fba..ae43d305 100644
--- a/pkg/io/listener.go
+++ b/pkg/io/listener.go
@@ -25,10 +25,10 @@ import (
"os"
"time"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/util"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
const (
@@ -148,10 +148,10 @@ func (l *Listener) AcceptAndServe() error {
cal.Event(cal.TxnTypeAccept, rhost, cal.StatusSuccess, []byte("raddr="+raddr+"&laddr="+conn.LocalAddr().String()))
}
}
- if otel.IsEnabled() {
- otel.RecordCount(otel.Accept, nil)
- }
+ otel.RecordCount(otel.Accept, []otel.Tags{{otel.Status, otel.Success}})
l.startNewConnector(conn)
+ } else {
+ otel.RecordCount(otel.Accept, []otel.Tags{{otel.Status, otel.Error}})
}
//log the error in caller if needed
return err
diff --git a/pkg/io/mayflyreqctx.go b/pkg/io/mayflyreqctx.go
index 8cf0a1f7..386896f9 100644
--- a/pkg/io/mayflyreqctx.go
+++ b/pkg/io/mayflyreqctx.go
@@ -26,13 +26,13 @@ import (
"io"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/pkg/io/outboundconnector.go b/pkg/io/outboundconnector.go
index db737560..5449405d 100644
--- a/pkg/io/outboundconnector.go
+++ b/pkg/io/outboundconnector.go
@@ -31,13 +31,13 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/io/ioutil"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io/ioutil"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
const (
diff --git a/pkg/io/outboundprocessor.go b/pkg/io/outboundprocessor.go
index 48fcbf28..102299a1 100644
--- a/pkg/io/outboundprocessor.go
+++ b/pkg/io/outboundprocessor.go
@@ -28,14 +28,14 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/pkg/errors"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/logging/otel"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/pkg/errors"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type (
@@ -114,9 +114,7 @@ func (p *OutboundProcessor) GetRequestCh() chan IRequestContext {
return p.reqCh
}
-//
// Non-blocking send
-//
func (p *OutboundProcessor) sendRequest(req IRequestContext) (err *errors.Error) {
// send request
select {
@@ -314,18 +312,16 @@ func (p *OutboundProcessor) OnConnectSuccess(conn Conn, connector *OutboundConne
cal.AtomicTransaction(cal.TxnTypeConnect, p.connInfo.GetConnString(), cal.StatusSuccess, timeTaken, data)
}
- if otel.IsEnabled() {
- otel.RecordOutboundConnection(p.connInfo.GetConnString(), otel.StatusSuccess, timeTaken.Milliseconds())
- }
+ otel.RecordOutboundConnection(p.connInfo.GetConnString(), otel.StatusSuccess, timeTaken.Microseconds())
+ otel.RecordCount(otel.TLSStatus, []otel.Tags{{otel.Endpoint, p.connInfo.GetConnString()}, {otel.TLS_version, conn.GetTLSVersion()},
+ {otel.Cipher, conn.GetCipherName()}, {otel.Ssl_r, conn.DidResume()}})
}
func (p *OutboundProcessor) OnConnectError(timeTaken time.Duration, connStr string, err error) {
if cal.IsEnabled() {
cal.AtomicTransaction(cal.TxnTypeConnect, connStr, cal.StatusError, timeTaken, []byte(err.Error()))
}
- if otel.IsEnabled() {
- otel.RecordOutboundConnection(connStr, otel.StatusError, timeTaken.Milliseconds())
- }
+ otel.RecordOutboundConnection(connStr, otel.StatusError, timeTaken.Microseconds())
}
func (p *OutboundProcessor) connect(connCh chan *OutboundConnector, id int, connector *OutboundConnector) {
diff --git a/pkg/io/requestcontext.go b/pkg/io/requestcontext.go
index 25c06f24..96cf9cd5 100644
--- a/pkg/io/requestcontext.go
+++ b/pkg/io/requestcontext.go
@@ -26,11 +26,11 @@ import (
"io"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/proto"
- "juno/pkg/proto/mayfly"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto/mayfly"
+ "github.com/paypal/junodb/pkg/util"
)
var oResponsePool = util.NewChanPool(10000, func() interface{} {
diff --git a/pkg/io/ssllistener.go b/pkg/io/ssllistener.go
index db623292..157411fc 100644
--- a/pkg/io/ssllistener.go
+++ b/pkg/io/ssllistener.go
@@ -26,11 +26,11 @@ import (
"syscall"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/sec"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/logging/otel"
)
type SslListener struct {
@@ -66,6 +66,8 @@ func (l *SslListener) AcceptAndServe() error {
cal.Event(cal.TxnTypeAccept, rhost, cal.StatusSuccess, b.Bytes())
}
}
+ otel.RecordCount(otel.Accept, []otel.Tags{{otel.Status, otel.Success}, {otel.TLS_version, sslConn.GetTLSVersion()},
+ {otel.Cipher, sslConn.GetCipherName()}, {otel.Ssl_r, sslConn.DidResume()}})
l.startNewConnector(sslConn.GetNetConn())
} else {
logAsWarning := true
@@ -95,6 +97,15 @@ func (l *SslListener) AcceptAndServe() error {
cal.Event(cal.TxnTypeAccept, rhost, st, b.Bytes())
}
}
+
+ otelStatus := otel.Success
+ if logAsWarning {
+ otelStatus = otel.Warn
+ }
+
+ otel.RecordCount(otel.Accept, []otel.Tags{{otel.Status, otelStatus}, {otel.TLS_version, sslConn.GetTLSVersion()},
+ {otel.Cipher, sslConn.GetCipherName()}, {otel.Ssl_r, sslConn.DidResume()}})
+
if logAsWarning {
glog.Warning("handshaking error: ", err)
} else {
diff --git a/pkg/logging/cal/config/calconfig.go b/pkg/logging/cal/config/calconfig.go
index 993c8471..12cf3dc0 100644
--- a/pkg/logging/cal/config/calconfig.go
+++ b/pkg/logging/cal/config/calconfig.go
@@ -20,7 +20,7 @@
package config
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var CalConfig *Config
diff --git a/pkg/logging/cal/logger.go b/pkg/logging/cal/logger.go
index d0a8b4a6..dcd6cb49 100644
--- a/pkg/logging/cal/logger.go
+++ b/pkg/logging/cal/logger.go
@@ -27,11 +27,11 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging/cal/config"
- "juno/pkg/logging/cal/net/io"
- "juno/pkg/logging/cal/net/protocol"
+ "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/logging/cal/net/io"
+ "github.com/paypal/junodb/pkg/logging/cal/net/protocol"
)
// CAL message Status field values
@@ -126,7 +126,7 @@ func LogAtomicTransaction(txnType, eventName, status string, duration time.Durat
client.Send(msg)
}
-//SendEvent logs an event of eventType with a sub-classification of
+// SendEvent logs an event of eventType with a sub-classification of
// eventName. The event may optionally contain extra eventData.
func LogEvent(eventType, eventName, status string, eventData map[string]interface{}) {
// TODO guard against bad eventType/eventName (perhaps in NewMsg())
diff --git a/pkg/logging/cal/net/io/client.go b/pkg/logging/cal/net/io/client.go
index a735200e..38137347 100644
--- a/pkg/logging/cal/net/io/client.go
+++ b/pkg/logging/cal/net/io/client.go
@@ -32,11 +32,11 @@ import (
"sync/atomic"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging/cal/config"
- "juno/pkg/logging/cal/net/protocol"
- "juno/pkg/logging/cal/util"
+ "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/logging/cal/net/protocol"
+ "github.com/paypal/junodb/pkg/logging/cal/util"
)
var logFile *os.File
@@ -259,9 +259,7 @@ func (c *client) sendFileLoop() {
}
}
-//
// Sender need to make should not send message after Shutdown()
-//
func (c *client) Send(m *protocol.CalMessage) {
if m == nil {
glog.V(2).Info("Cal: Message can not be nil.")
@@ -282,7 +280,7 @@ func (c *client) Send(m *protocol.CalMessage) {
}
}
-//If you close client connection you wouldnt be able to log anything using logger.
+// If you close client connection you wouldnt be able to log anything using logger.
// This should be called when parent process Shutdown.
func (c *client) Shutdown() {
c.closeOnce.Do(func() {
@@ -307,7 +305,7 @@ func (c *client) Shutdown() {
})
}
-//Flush blocks till the messages are processed by the channel
+// Flush blocks till the messages are processed by the channel
func (c *client) Flush() {
c.wg.Wait()
if logFile != nil {
diff --git a/pkg/logging/cal/net/io/clientapi.go b/pkg/logging/cal/net/io/clientapi.go
index fd0155ef..c9105393 100644
--- a/pkg/logging/cal/net/io/clientapi.go
+++ b/pkg/logging/cal/net/io/clientapi.go
@@ -21,10 +21,11 @@ package io
import (
"bufio"
- "juno/pkg/logging/cal/net/protocol"
"net"
"sync"
"sync/atomic"
+
+ "github.com/paypal/junodb/pkg/logging/cal/net/protocol"
)
// Client is a CAL client. It is used to configure and organize
diff --git a/pkg/logging/cal/net/protocol/message.go b/pkg/logging/cal/net/protocol/message.go
index f096318c..1ebb2896 100644
--- a/pkg/logging/cal/net/protocol/message.go
+++ b/pkg/logging/cal/net/protocol/message.go
@@ -22,11 +22,12 @@ package protocol
import (
"bytes"
"fmt"
- "juno/third_party/forked/golang/glog"
"strconv"
"strings"
"time"
"unicode"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// Msg is a single log message.
diff --git a/pkg/logging/cal/test/main.go b/pkg/logging/cal/test/main.go
index 9d107065..75b2e0fb 100644
--- a/pkg/logging/cal/test/main.go
+++ b/pkg/logging/cal/test/main.go
@@ -20,21 +20,21 @@
package main
import (
- "juno/pkg/logging/cal"
- logger "juno/pkg/logging/cal"
- "juno/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ logger "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/logging/cal/config"
"github.com/BurntSushi/toml"
- //"juno/pkg/logging/cal/config"
+ //"github.com/paypal/junodb/pkg/logging/cal/config"
"flag"
"fmt"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
//"io"
// "log"
- //"juno/pkg/logging/cal/net/protocol"
+ //"github.com/paypal/junodb/pkg/logging/cal/net/protocol"
//"os"
// "runtime"
// "net/http"
diff --git a/pkg/logging/cal/util/util.go b/pkg/logging/cal/util/util.go
index c5760ea0..c2919beb 100644
--- a/pkg/logging/cal/util/util.go
+++ b/pkg/logging/cal/util/util.go
@@ -22,13 +22,14 @@ package util
import (
"fmt"
"hash/fnv"
- "juno/pkg/logging/cal/net/protocol"
"net"
"os"
"path"
"runtime"
"strconv"
"time"
+
+ "github.com/paypal/junodb/pkg/logging/cal/net/protocol"
)
const (
diff --git a/pkg/logging/calstatus.go b/pkg/logging/calstatus.go
index 8ff37d8a..4e89d1f7 100644
--- a/pkg/logging/calstatus.go
+++ b/pkg/logging/calstatus.go
@@ -20,8 +20,8 @@
package logging
import (
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
type Status int
diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
index 061cc7bd..b219aeec 100644
--- a/pkg/logging/logging.go
+++ b/pkg/logging/logging.go
@@ -26,11 +26,11 @@ import (
"strconv"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type KeyValueBuffer struct {
@@ -360,7 +360,7 @@ func (b *KeyValueBuffer) AddOpRequestInfo(request *proto.OperationalMessage) *Ke
return b
}
-//difference from AddOpRequestInfo(): namespace and key not logged
+// difference from AddOpRequestInfo(): namespace and key not logged
func (b *KeyValueBuffer) AddOpRequest(request *proto.OperationalMessage) *KeyValueBuffer {
b.Add(logDataKeyRid, request.GetRequestIDString())
reqParam := &KeyValueBuffer{delimiter: ':', pairDelimiter: '|'}
diff --git a/pkg/logging/otel/config/otelconfig.go b/pkg/logging/otel/config/otelconfig.go
index 458dc90a..6f305c11 100644
--- a/pkg/logging/otel/config/otelconfig.go
+++ b/pkg/logging/otel/config/otelconfig.go
@@ -1,50 +1,54 @@
+// Copyright 2023 PayPal Inc.
//
-// Copyright 2023 PayPal Inc.
+// 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
//
-// 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.
+// 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 config
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var OtelConfig *Config
+type HistBuckets struct {
+ Replication []float64
+ SsConnect []float64
+ Inbound []float64
+ OutboundConnection []float64
+}
+
type Config struct {
- Host string
- Port uint32
- Environment string
- Poolname string
- Enabled bool
- Resolution uint32
- UseTls bool
+ Host string
+ Port uint32
+ UrlPath string
+ Environment string
+ Poolname string
+ Enabled bool
+ Resolution uint32
+ UseTls bool
+ HistogramBuckets HistBuckets
}
func (c *Config) Validate() {
if len(c.Poolname) <= 0 {
glog.Fatal("Error: Otel Poolname is required.")
}
+ c.setDefaultIfNotDefined()
}
-func (c *Config) SetPoolName(name string) {
- c.Poolname = name
-}
-
-func (c *Config) Default() {
+func (c *Config) setDefaultIfNotDefined() {
if c.Host == "" {
c.Host = "127.0.0.1"
}
@@ -55,7 +59,22 @@ func (c *Config) Default() {
c.Resolution = 60
}
if c.Environment == "" {
- c.Environment = "OpenSource"
+ c.Environment = "PayPal"
+ }
+ if c.UrlPath == "" {
+ c.UrlPath = "v1/datapoint"
+ }
+ if c.HistogramBuckets.Inbound == nil {
+ c.HistogramBuckets.Inbound = []float64{200, 400, 800, 1200, 2400, 3600, 7200, 10800, 21600, 43200, 86400, 172800}
+ }
+ if c.HistogramBuckets.OutboundConnection == nil {
+ c.HistogramBuckets.OutboundConnection = []float64{200, 400, 800, 1200, 2400, 3600, 7200, 10800, 21600, 43200, 86400, 172800}
+ }
+ if c.HistogramBuckets.Replication == nil {
+ c.HistogramBuckets.Replication = []float64{200, 400, 800, 1200, 2400, 3600, 7200, 10800, 21600, 43200, 86400, 172800}
+ }
+ if c.HistogramBuckets.SsConnect == nil {
+ c.HistogramBuckets.SsConnect = []float64{100, 200, 300, 400, 800, 1200, 2400, 3600, 10800, 21600, 86400, 172800}
}
}
@@ -65,5 +84,10 @@ func (c *Config) Dump() {
glog.Infof("Environment: %s", c.Environment)
glog.Infof("Poolname: %s", c.Poolname)
glog.Infof("Resolution: %d", c.Resolution)
- glog.Info("UseTls: %b", c.UseTls)
+ glog.Infof("UseTls: %t", c.UseTls)
+ glog.Infof("UrlPath: %s", c.UrlPath)
+ glog.Info("Inbound Bucket: ", c.HistogramBuckets.Inbound)
+ glog.Info("OutboundConnection Bucket: ", c.HistogramBuckets.OutboundConnection)
+ glog.Info("Replication Bucket: ", c.HistogramBuckets.Replication)
+ glog.Info("SsConnect Bucket: ", c.HistogramBuckets.SsConnect)
}
diff --git a/pkg/logging/otel/defs.go b/pkg/logging/otel/defs.go
new file mode 100644
index 00000000..7421864b
--- /dev/null
+++ b/pkg/logging/otel/defs.go
@@ -0,0 +1,267 @@
+//
+// Copyright 2023 PayPal Inc.
+//
+// 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 otel
+
+import (
+ "sync"
+ "time"
+
+ instrument "go.opentelemetry.io/otel/metric"
+ "go.opentelemetry.io/otel/sdk/metric"
+)
+
+//*************************** Constants ****************************
+const (
+ RRDropMaxRetry CMetric = CMetric(iota)
+ RRDropQueueFull
+ RRDropRecExpired
+ SSL_CLIENT_INFO
+ CLIENT_INFO
+ Accept
+ Close
+ RAPI
+ ReqProc
+ ProcErr
+ SoftMark
+ TLSStatus
+ Inbound
+ Replication
+ OutboundConnection
+ SSConnection
+)
+
+const (
+ Target = string("target")
+ Endpoint = string("target_ip_port")
+ Operation = string("operation")
+ Client = string("client_app")
+ Status = string("status")
+ Fatal = string("Fatal")
+ Error = string("Error")
+ Warn = string("Warning")
+ Success = string("Success")
+ SS_RB_expire = string("SS_RB_expire")
+ SSReqTimeout = string("SSReqTimeout")
+ SSMarkDown = string("Down")
+ SSMarkUp = string("Up")
+ TLS_version = string("tls_version")
+ Cipher = string("cipher")
+ Ssl_r = string("ssl_r")
+)
+
+const (
+ SvrTypeProxy = ServerType(1)
+ SvrTypeStorage = ServerType(2)
+ SvrTypeClusterMgr = ServerType(3)
+ SvrTypeAll = ServerType(6)
+)
+
+// OTEl Status
+const (
+ StatusSuccess string = "SUCCESS"
+ StatusFatal string = "FATAL"
+ StatusError string = "ERROR"
+ StatusWarning string = "WARNING"
+ StatusUnknown string = "UNKNOWN"
+)
+
+const (
+ MachineCpuUsed string = string("machineCpuUsed")
+ ProcessCpuUsed string = string("machineCpuUsed")
+ MachineMemoryUsed
+ ProcessMemoryUsed
+)
+
+// default OTEL configurations point to QA collector
+const DEFAULT_OTEL_COLLECTOR_PROTOCOL string = "http"
+const DEFAULT_OTEL_COLLECTOR__IP string = "0.0.0.0"
+const DEFAULT_GRPC_OTEL_COLLECTOR_PORT string = "4317"
+const DEFAULT_HTTP_OTEL_COLLECTOR_PORT string = "4318"
+const COLLECTOR_POLLING_INTERVAL_SECONDS int32 = 5
+
+const JUNO_METRIC_PREFIX = "juno.server."
+const MeterName = "juno-server-meter"
+const histChannelSize = 1000
+const counterChannelSize = 1000
+
+//****************************** variables ***************************
+
+var (
+ apiHistogramOnce sync.Once
+ replicationHistogramOnce sync.Once
+ connectHistogramOnce sync.Once
+ ssConnectHistogramOnce sync.Once
+ rrDropMaxRetryCounterOnce sync.Once
+ rrDropQueueFullCounterOnce sync.Once
+ rrDropRecExpiredCounterOnce sync.Once
+ acceptCounterOnce sync.Once
+ closeCounterOnce sync.Once
+ rapiCounterOnce sync.Once
+ reqProcCounterOnce sync.Once
+ procErrCounterOnce sync.Once
+ softMarkCounterOnce sync.Once
+ tlsStatusCounterOnce sync.Once
+ sslClientInfoOnce sync.Once
+ clientInfoOnce sync.Once
+)
+
+var apiHistogram instrument.Int64Histogram
+var replicationHistogram instrument.Int64Histogram
+var connectHistogram instrument.Int64Histogram
+var ssConnectHistogram instrument.Int64Histogram
+
+var opsHistChannel chan DataPoint
+var replHistChannel chan DataPoint
+var ssConnHistChannel chan DataPoint
+var outBoundHistChannel chan DataPoint
+var counterChannel chan DataPoint
+
+var opsHistDoneCh chan bool
+var replHistCh chan bool
+var ssConnHistCh chan bool
+var outBoundHistCh chan bool
+
+var countMetricMap map[CMetric]*countMetric = map[CMetric]*countMetric{
+ RRDropMaxRetry: {"RR_Drop_MaxRetry", "Records dropped in replication queue due to max retry failures", nil, &rrDropMaxRetryCounterOnce, nil, nil},
+ RRDropQueueFull: {"RR_Drop_QueueFull", "Records dropped in replication queue due to queue is full", nil, &rrDropQueueFullCounterOnce, nil, nil},
+ RRDropRecExpired: {"RR_Drop_RecExpired", "Records dropped in replication queue due to expiry of records", nil, &rrDropRecExpiredCounterOnce, nil, nil},
+ SSL_CLIENT_INFO: {"SSL_CLIENT_INFO", "Client app Info", nil, &sslClientInfoOnce, nil, nil},
+ CLIENT_INFO: {"CLIENT_INFO", "Client app Info", nil, &clientInfoOnce, nil, nil},
+ Accept: {"accept", "Accepting incoming connections", nil, &acceptCounterOnce, nil, nil},
+ Close: {"close", "Closing incoming connections", nil, &closeCounterOnce, nil, nil},
+ RAPI: {"rapi", "Processing of replicated requests", nil, &rapiCounterOnce, nil, nil},
+ ReqProc: {"ReqProc", "Request processor", nil, &reqProcCounterOnce, nil, nil},
+ ProcErr: {"ProcErr", "Request processor Error", nil, &procErrCounterOnce, nil, nil},
+ SoftMark: {"SoftMark", "Proxy marks down storage instances", nil, &softMarkCounterOnce, nil, nil},
+ TLSStatus: {"TLS_Status", "TLS connection state", nil, &tlsStatusCounterOnce, nil, nil},
+}
+
+var histMetricMap map[CMetric]*histogramMetric = map[CMetric]*histogramMetric{
+ Inbound: {PopulateJunoMetricNamePrefix("inbound"), "Histogram for Juno API", "ms", nil, &apiHistogramOnce, nil, nil},
+ Replication: {PopulateJunoMetricNamePrefix("replication"), "Histogram for Juno replication", "ms", nil, &replicationHistogramOnce, nil, nil},
+ OutboundConnection: {PopulateJunoMetricNamePrefix("outbound_connection"), "Histogram for Juno connection", "us", nil, &connectHistogramOnce, nil, nil},
+ SSConnection: {PopulateJunoMetricNamePrefix("ssConnection"), "Histogram for Juno SS connection", "us", nil, &ssConnectHistogramOnce, nil, nil},
+}
+
+var (
+ meterProvider *metric.MeterProvider
+)
+
+var (
+ machineCpuUsedOnce sync.Once
+ processCpuUsedOnce sync.Once
+ machineMemoryUsedOnce sync.Once
+ processMemoryUsedOnce sync.Once
+ diskIOUtilization sync.Once
+ badShardOnce sync.Once
+ alertShardOnce sync.Once
+ warningShardOnce sync.Once
+ keyCountOnce sync.Once
+ freeStorageOnce sync.Once
+ usedStorageOnce sync.Once
+ LNLevelOnce sync.Once
+ compSecOnce sync.Once
+ compCountOnce sync.Once
+ pendingCompOnce sync.Once
+ stallOnce sync.Once
+ TCPConnCountOnce sync.Once
+ SSLConnCountOnce sync.Once
+)
+
+var (
+ machTime time.Time
+ machCpuTick uint16
+ machUser uint64
+ machSystem uint64
+)
+
+var GaugeMetricList = []*GaugeMetric{
+ {"pCPU", "proc_cpu_used", "CPU utilization of individual Juno instance", nil, nil, &processCpuUsedOnce, SvrTypeAll},
+ {"pMem", "proc_mem_used", "Memory utilization of individual Juno instance", nil, nil, &processMemoryUsedOnce, SvrTypeAll},
+
+ {"nBShd", "bad_shard", "Number of bad shards", nil, nil, &badShardOnce, SvrTypeProxy},
+ {"nAShd", "alert_shard", "number of shards with no redundancy", nil, nil, &alertShardOnce, SvrTypeProxy},
+ {"nWShd", "warning_shard", "number of shards with bad SS", nil, nil, &warningShardOnce, SvrTypeProxy},
+
+ {"conns", "conns_count", "number of current TCP connections", nil, nil, &TCPConnCountOnce, SvrTypeProxy},
+ {"ssl_conns", "conns_ssl_count", "number of current SSL connections", nil, nil, &SSLConnCountOnce, SvrTypeProxy},
+ {"keys", "key_count", "Key Counte in rocksDB", nil, nil, &keyCountOnce, SvrTypeStorage},
+ {"free", "free_mb_storage_space", "Free Storage Space (mbytes)", nil, nil, &freeStorageOnce, SvrTypeStorage},
+ {"used", "storage_used_mb", "Used Storage Space (mbytes)", nil, nil, &usedStorageOnce, SvrTypeStorage},
+ {"LN", "LN_level", "Max LN Level in Rocksdb", nil, nil, &LNLevelOnce, SvrTypeStorage},
+ {"compSec", "compaction_sec", "Compaction Sec", nil, nil, &compSecOnce, SvrTypeStorage},
+ {"compCount", "compaction_count", "Compaction Count", nil, nil, &compCountOnce, SvrTypeStorage},
+ {"pCompKB", "pending_compaction", "Pending Compaction KBytes", nil, nil, &pendingCompOnce, SvrTypeStorage},
+ {"stall", "stall_write_rate", "Actural Delayed Write Rate", nil, nil, &stallOnce, SvrTypeStorage},
+}
+
+var otelIngestToken string
+
+// ************************************ Types ****************************
+type CMetric int
+
+type Tags struct {
+ TagName string
+ TagValue string
+}
+
+type countMetric struct {
+ metricName string
+ metricDesc string
+ counter instrument.Int64Counter
+ createCounter *sync.Once
+ counterCh chan DataPoint
+ doneCh chan bool
+}
+
+type histogramMetric struct {
+ metricName string
+ metricDesc string
+ metricUnit string
+ histogram instrument.Int64Histogram
+ createHistogram *sync.Once
+ histogramCh chan DataPoint
+ doneCh chan bool
+}
+
+type (
+ ServerType int
+)
+
+type GaugeMetric struct {
+ MetricShortName string
+ MetricName string
+ metricDesc string
+ gaugeMetric instrument.Float64ObservableGauge
+ stats []StateData
+ createGauge *sync.Once
+ stype ServerType
+}
+
+// Represents stats by a worker
+type StateData struct {
+ Name string
+ Value float64
+ Dimensions instrument.MeasurementOption
+}
+
+type DataPoint struct {
+ attr instrument.MeasurementOption
+ data int64
+}
diff --git a/pkg/logging/otel/logger.go b/pkg/logging/otel/logger.go
index 5559085e..e226be8b 100644
--- a/pkg/logging/otel/logger.go
+++ b/pkg/logging/otel/logger.go
@@ -1,156 +1,47 @@
+// Copyright 2023 PayPal Inc.
//
-// Copyright 2023 PayPal Inc.
+// 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
//
-// 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.
+// 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 otel
import (
- "bufio"
"context"
"errors"
"fmt"
- "io"
"log"
"os"
- "strings"
- "sync"
+
"time"
- otelCfg "juno/pkg/logging/otel/config"
- "juno/third_party/forked/golang/glog"
+ otelCfg "github.com/paypal/junodb/pkg/logging/otel/config"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
- "go.opentelemetry.io/otel/metric/global"
- "go.opentelemetry.io/otel/metric/instrument"
- "go.opentelemetry.io/otel/metric/instrument/syncint64"
- "go.opentelemetry.io/otel/metric/unit"
+ instrument "go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/sdk/instrumentation"
"go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/aggregation"
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
- semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
-)
-
-var (
- apiHistogramOnce sync.Once
- replicationHistogramOnce sync.Once
- connectHistogramOnce sync.Once
- ssConnectHistogramOnce sync.Once
- rrDropMaxRetryCounterOnce sync.Once
- rrDropQueueFullCounterOnce sync.Once
- rrDropRecExpiredCounterOnce sync.Once
- acceptCounterOnce sync.Once
- closeCounterOnce sync.Once
- rapiCounterOnce sync.Once
- reqProcCounterOnce sync.Once
- procErrCounterOnce sync.Once
-)
-
-var apiHistogram syncint64.Histogram
-var replicationHistogram syncint64.Histogram
-var connectHistogram syncint64.Histogram
-var ssConnectHistogram syncint64.Histogram
-
-type CMetric int
-
-const (
- RRDropMaxRetry CMetric = CMetric(iota)
- RRDropQueueFull
- RRDropRecExpired
- Accept
- Close
- RAPI
- ReqProc
- ProcErr
-)
-
-type Tags struct {
- TagName string
- TagValue string
-}
-
-const (
- Target = string("target")
- Endpoint = string("endpoint")
- Operation = string("operation")
- Status = string("status")
- Fatal = string("Fatal")
- Error = string("Error")
- Warn = string("Warning")
- Success = string("Success")
- SS_RB_expire = string("SS_RB_expire")
- SSReqTimeout = string("SSReqTimeout")
-)
-
-type countMetric struct {
- metricName string
- metricDesc string
- counter syncint64.Counter
- createCounter *sync.Once
-}
-
-var countMetricMap map[CMetric]*countMetric = map[CMetric]*countMetric{
- RRDropMaxRetry: {"RR_Drop_MaxRetry", "Records dropped in replication queue due to max retry failures", nil, &rrDropMaxRetryCounterOnce},
- RRDropQueueFull: {"RR_Drop_QueueFull", "Records dropped in replication queue due to queue is full", nil, &rrDropQueueFullCounterOnce},
- RRDropRecExpired: {"RR_Drop_RecExpired", "Records dropped in replication queue due to expiry of records", nil, &rrDropRecExpiredCounterOnce},
- Accept: {"accept", "Accepting incoming connections", nil, &acceptCounterOnce},
- Close: {"close", "Closing incoming connections", nil, &closeCounterOnce},
- RAPI: {"rapi", "Processing of replicated requests", nil, &rapiCounterOnce},
- ReqProc: {"ReqProc", "Processing of replicated requests", nil, &reqProcCounterOnce},
- ProcErr: {"ProcErr", "Processing of replicated requests", nil, &procErrCounterOnce},
-}
-
-type (
- ServerType int
-)
-
-const (
- SvrTypeProxy = ServerType(1)
- SvrTypeStorage = ServerType(2)
- SvrTypeClusterMgr = ServerType(3)
- SvrTypeAll = ServerType(6)
)
-// default OTEL configurations point to QA collector
-var DEFAULT_OTEL_COLLECTOR_PROTOCOL string = "http"
-var DEFAULT_GRPC_OTEL_COLLECTOR_PORT string = "30705"
-var DEFAULT_HTTP_OTEL_COLLECTOR_PORT string = "30706"
-var COLLECTOR_POLLING_INTERVAL_SECONDS int32 = 5
-
-const JUNO_METRIC_PREFIX = "juno.server."
-const MeterName = "juno-server-meter"
-
var OTEL_COLLECTOR_PROTOCOL string = DEFAULT_OTEL_COLLECTOR_PROTOCOL
-// OTEl Status
-const (
- StatusSuccess string = "SUCCESS"
- StatusFatal string = "FATAL"
- StatusError string = "ERROR"
- StatusWarning string = "WARNING"
- StatusUnknown string = "UNKNOWN"
-)
-
-var (
- meterProvider *metric.MeterProvider
-)
-
func Initialize(args ...interface{}) (err error) {
glog.Info("Juno OTEL initialized")
sz := len(args)
@@ -166,6 +57,7 @@ func Initialize(args ...interface{}) (err error) {
glog.Error(err)
return
}
+ c.Validate()
c.Dump()
if c.Enabled {
// Initialize only if OTEL is enabled
@@ -174,36 +66,84 @@ func Initialize(args ...interface{}) (err error) {
return
}
+func Finalize() {
+ // Shutdown the Go routines for histograms
+ for _, val := range histMetricMap {
+ if val.histogram != nil && val.doneCh != nil {
+ close(val.doneCh)
+ }
+ }
+
+ // Shutdown the Go routines for counters that are active
+ for _, val := range countMetricMap {
+ if val.counter != nil && val.doneCh != nil {
+ close(val.doneCh)
+ }
+ }
+}
+
func InitMetricProvider(config *otelCfg.Config) {
if meterProvider != nil {
- fmt.Printf("Retrung as meter is already available")
return
}
- //TODO Remove this after testing
otelCfg.OtelConfig = config
ctx := context.Background()
-
// View to customize histogram buckets and rename a single histogram instrument.
repBucketsView := metric.NewView(
metric.Instrument{
- Name: "*replication*",
+ Name: PopulateJunoMetricNamePrefix("replication"),
Scope: instrumentation.Scope{Name: MeterName},
},
metric.Stream{
- Name: "replication",
Aggregation: aggregation.ExplicitBucketHistogram{
- Boundaries: []float64{64, 128, 256, 512, 1024, 2048, 4096},
+ Boundaries: config.HistogramBuckets.Replication,
},
- })
+ },
+ )
+
+ ssConnBucketsView := metric.NewView(
+ metric.Instrument{
+ Name: PopulateJunoMetricNamePrefix("ssConnection"),
+ Scope: instrumentation.Scope{Name: MeterName},
+ },
+ metric.Stream{
+ Aggregation: aggregation.ExplicitBucketHistogram{
+ Boundaries: config.HistogramBuckets.SsConnect,
+ },
+ },
+ )
+
+ inboundBucketsView := metric.NewView(
+ metric.Instrument{
+ Name: PopulateJunoMetricNamePrefix("inbound"),
+ Scope: instrumentation.Scope{Name: MeterName},
+ },
+ metric.Stream{
+ Aggregation: aggregation.ExplicitBucketHistogram{
+ Boundaries: config.HistogramBuckets.Inbound,
+ },
+ },
+ )
+
+ outboundBucketsView := metric.NewView(
+ metric.Instrument{
+ Name: PopulateJunoMetricNamePrefix("outbound_connection"),
+ Scope: instrumentation.Scope{Name: MeterName},
+ },
+ metric.Stream{
+ Aggregation: aggregation.ExplicitBucketHistogram{
+ Boundaries: config.HistogramBuckets.OutboundConnection,
+ },
+ },
+ )
- provider, err := NewMeterProvider(ctx, *config, repBucketsView)
+ var err error
+ meterProvider, err = NewMeterProvider(ctx, *config, repBucketsView, ssConnBucketsView, inboundBucketsView, outboundBucketsView)
if err != nil {
log.Fatal(err)
}
- provider.Meter(MeterName)
- global.SetMeterProvider(provider)
}
func NewMeterProvider(ctx context.Context, cfg otelCfg.Config, vis ...metric.View) (*metric.MeterProvider, error) {
@@ -216,32 +156,32 @@ func NewMeterProvider(ctx context.Context, cfg otelCfg.Config, vis ...metric.Vie
// Set the reader collection periord to 10 seconds (default 60).
reader := metric.NewPeriodicReader(exp, metric.WithInterval(time.Duration(cfg.Resolution)*time.Second))
- meterProvider = metric.NewMeterProvider(
+ metProvider := metric.NewMeterProvider(
metric.WithResource(res),
metric.WithReader(reader),
metric.WithView(vis...),
)
- return meterProvider, nil
+ return metProvider, nil
}
func NewHTTPExporter(ctx context.Context) (metric.Exporter, error) {
+ header := make(map[string]string)
var deltaTemporalitySelector = func(metric.InstrumentKind) metricdata.Temporality { return metricdata.DeltaTemporality }
if otelCfg.OtelConfig.UseTls == true {
return otlpmetrichttp.New(
ctx,
otlpmetrichttp.WithEndpoint(otelCfg.OtelConfig.Host+":"+fmt.Sprintf("%d", otelCfg.OtelConfig.Port)),
- //otlpmetrichttp.WithInsecure(),
// WithTimeout sets the max amount of time the Exporter will attempt an
// export.
- //func(metric.InstrumentKindSyncHistogram){return metricdata.DeltaTemporality}
- otlpmetrichttp.WithTimeout(7*time.Second),
+ otlpmetrichttp.WithTimeout(20*time.Second),
otlpmetrichttp.WithCompression(otlpmetrichttp.NoCompression),
otlpmetrichttp.WithTemporalitySelector(deltaTemporalitySelector),
+ otlpmetrichttp.WithHeaders(header),
otlpmetrichttp.WithRetry(otlpmetrichttp.RetryConfig{
// Enabled indicates whether to not retry sending batches in case
// of export failure.
- Enabled: true,
+ Enabled: false,
// InitialInterval the time to wait after the first failure before
// retrying.
InitialInterval: 1 * time.Second,
@@ -252,8 +192,9 @@ func NewHTTPExporter(ctx context.Context) (metric.Exporter, error) {
// MaxElapsedTime is the maximum amount of time (including retries)
// spent trying to send a request/batch. Once this value is
// reached, the data is discarded.
- MaxElapsedTime: 240 * time.Second,
+ MaxElapsedTime: 20 * time.Second,
}),
+ otlpmetrichttp.WithURLPath(otelCfg.OtelConfig.UrlPath),
)
} else {
return otlpmetrichttp.New(
@@ -263,12 +204,14 @@ func NewHTTPExporter(ctx context.Context) (metric.Exporter, error) {
otlpmetrichttp.WithTimeout(7*time.Second),
otlpmetrichttp.WithCompression(otlpmetrichttp.NoCompression),
otlpmetrichttp.WithTemporalitySelector(deltaTemporalitySelector),
+ otlpmetrichttp.WithHeaders(header),
otlpmetrichttp.WithRetry(otlpmetrichttp.RetryConfig{
Enabled: true,
InitialInterval: 1 * time.Second,
MaxInterval: 10 * time.Second,
MaxElapsedTime: 240 * time.Second,
}),
+ otlpmetrichttp.WithURLPath(otelCfg.OtelConfig.UrlPath),
)
}
@@ -284,73 +227,43 @@ func IsEnabled() bool {
return meterProvider != nil
}
-func GetHistogramForOperation() (syncint64.Histogram, error) {
- var err error
- apiHistogramOnce.Do(func() {
- meter := global.Meter(MeterName)
- apiHistogram, err = meter.SyncInt64().Histogram(
- PopulateJunoMetricNamePrefix("inbound"),
- instrument.WithDescription("Histogram for Juno API"),
- instrument.WithUnit(unit.Milliseconds),
- )
-
- })
- return apiHistogram, err
-}
-
-func GetHistogramForReplication() (syncint64.Histogram, error) {
- var err error
- replicationHistogramOnce.Do(func() {
- meter := global.Meter(MeterName)
- replicationHistogram, err = meter.SyncInt64().Histogram(
- PopulateJunoMetricNamePrefix("replication"),
- instrument.WithDescription("Histogram for Juno replication"),
- instrument.WithUnit(unit.Milliseconds),
- )
-
- })
- return replicationHistogram, err
-}
-
-func GetHistogramForReplicationConnect() (syncint64.Histogram, error) {
- var err error
- connectHistogramOnce.Do(func() {
- meter := global.Meter(MeterName)
- connectHistogram, err = meter.SyncInt64().Histogram(
- PopulateJunoMetricNamePrefix("outbound_connection"),
- instrument.WithDescription("Histogram for Juno connection"),
- instrument.WithUnit(unit.Milliseconds),
- )
-
- })
- return connectHistogram, err
-}
-
-func GetHistogramForSSConnect() (syncint64.Histogram, error) {
- var err error
- ssConnectHistogramOnce.Do(func() {
- meter := global.Meter(MeterName)
- ssConnectHistogram, err = meter.SyncInt64().Histogram(
- PopulateJunoMetricNamePrefix("ssConnection"),
- instrument.WithDescription("Histogram for Juno SS connection failure"),
- instrument.WithUnit(unit.Milliseconds),
- )
-
- })
- return ssConnectHistogram, err
+func getHistogram(histName CMetric) (chan DataPoint, error) {
+ if histMetric, ok := histMetricMap[histName]; ok {
+ histMetric.createHistogram.Do(func() {
+ meter := meterProvider.Meter(MeterName)
+ histMetric.histogram, _ = meter.Int64Histogram(
+ histMetric.metricName,
+ instrument.WithDescription(histMetric.metricDesc),
+ instrument.WithUnit(histMetric.metricUnit),
+ )
+ histMetric.doneCh = make(chan bool)
+ histMetric.histogramCh = make(chan DataPoint, histChannelSize)
+ go doWriteHistogram(histMetric.histogramCh, histMetric.doneCh, histMetric.histogram)
+ })
+ if histMetric.histogramCh != nil {
+ return histMetric.histogramCh, nil
+ } else {
+ return nil, errors.New("Histogram Object not Ready")
+ }
+ } else {
+ return nil, errors.New("No Such Histogram exists")
+ }
}
-func GetCounter(counterName CMetric) (syncint64.Counter, error) {
+func GetCounter(counterName CMetric) (chan DataPoint, error) {
if counterMetric, ok := countMetricMap[counterName]; ok {
counterMetric.createCounter.Do(func() {
- meter := global.Meter(MeterName)
- counterMetric.counter, _ = meter.SyncInt64().Counter(
+ meter := meterProvider.Meter(MeterName)
+ counterMetric.counter, _ = meter.Int64Counter(
PopulateJunoMetricNamePrefix(counterMetric.metricName),
instrument.WithDescription(counterMetric.metricDesc),
)
+ counterMetric.doneCh = make(chan bool)
+ counterMetric.counterCh = make(chan DataPoint, counterChannelSize)
+ go doWriteCounter(counterMetric.counterCh, counterMetric.doneCh, counterMetric.counter)
})
- if counterMetric.counter != nil {
- return counterMetric.counter, nil
+ if counterMetric.counterCh != nil {
+ return counterMetric.counterCh, nil
} else {
return nil, errors.New("Counter Object not Ready")
}
@@ -360,154 +273,130 @@ func GetCounter(counterName CMetric) (syncint64.Counter, error) {
}
// This is the pp.app.intbound metric
-func RecordOperation(opType string, status string, latency int64) {
- ctx := context.Background()
- if operation, err := GetHistogramForOperation(); err == nil {
- commonLabels := []attribute.KeyValue{
- attribute.String("operation", opType),
- attribute.String("status", status),
+func RecordOperation(opType string, status proto.OpStatus, latency int64) {
+ if IsEnabled() {
+ if opsHistChannel, err := getHistogram(Inbound); err == nil {
+ commonLabels := instrument.WithAttributes(
+ attribute.String("endpoint", opType),
+ attribute.String("error_reason", status.ShortNameString()),
+ attribute.String("status", logging.CalStatus(status).CalStatus()),
+ )
+ dataPoint := DataPoint{commonLabels, latency}
+ if opsHistChannel != nil && len(opsHistChannel) < histChannelSize {
+ opsHistChannel <- dataPoint
+ }
}
- operation.Record(ctx, latency, commonLabels...)
}
}
func RecordReplication(opType string, status string, destination string, latency int64) {
- ctx := context.Background()
- if replication, err := GetHistogramForReplication(); err == nil {
- commonLabels := []attribute.KeyValue{
- attribute.String("operation", opType),
- attribute.String("status", status),
- attribute.String("dest_az", destination),
+ if IsEnabled() {
+ if replHistChannel, err := getHistogram(Replication); err == nil {
+ commonLabels := instrument.WithAttributes(
+ attribute.String("operation", opType),
+ attribute.String("status", status),
+ attribute.String("dest_az", destination),
+ )
+ dataPoint := DataPoint{commonLabels, latency}
+ if replHistChannel != nil && len(replHistChannel) < histChannelSize {
+ replHistChannel <- dataPoint
+ }
}
- replication.Record(ctx, latency, commonLabels...)
}
}
func RecordSSConnection(endpoint string, status string, latency int64) {
- ctx := context.Background()
- if ssConnect, err := GetHistogramForSSConnect(); err == nil {
- commonLabels := []attribute.KeyValue{
- attribute.String("endpoint", endpoint),
- attribute.String("status", status),
+ if IsEnabled() {
+ if ssConnHistChannel, err := getHistogram(SSConnection); err == nil {
+ commonLabels := instrument.WithAttributes(
+ attribute.String("endpoint", endpoint),
+ attribute.String("status", status),
+ )
+ dataPoint := DataPoint{commonLabels, latency}
+ if ssConnHistChannel != nil && len(ssConnHistChannel) < histChannelSize {
+ ssConnHistChannel <- dataPoint
+ }
}
- ssConnect.Record(ctx, latency, commonLabels...)
}
}
func RecordOutboundConnection(endpoint string, status string, latency int64) {
- ctx := context.Background()
- if requestLatency, err := GetHistogramForReplicationConnect(); err == nil {
- commonLabels := []attribute.KeyValue{
- attribute.String("endpoint", endpoint),
- attribute.String("status", status),
+ if IsEnabled() {
+ if outBoundHistChannel, err := getHistogram(OutboundConnection); err == nil {
+ commonLabels := instrument.WithAttributes(
+ attribute.String(Endpoint, endpoint),
+ attribute.String("status", status),
+ )
+ dataPoint := DataPoint{commonLabels, latency}
+ if outBoundHistChannel != nil && len(outBoundHistChannel) < histChannelSize {
+ outBoundHistChannel <- dataPoint
+ }
}
- requestLatency.Record(ctx, latency, commonLabels...)
}
}
func RecordCount(counterName CMetric, tags []Tags) {
- ctx := context.Background()
- if counter, err := GetCounter(counterName); err == nil {
- if len(tags) != 0 {
- // commonLabels := []attribute.KeyValue{
- // attribute.String("endpoint", endpoint),
- // }
- commonLabels := covertTagsToOTELAttributes(tags)
- counter.Add(ctx, 1, commonLabels...)
+ if IsEnabled() {
+ if counterChannel, err := GetCounter(counterName); err == nil {
+ var commonLabels instrument.MeasurementOption
+ if len(tags) != 0 {
+ commonLabels = covertTagsToOTELAttributes(tags)
+ }
+ dataPoint := DataPoint{commonLabels, 1}
+ if counterChannel != nil && len(counterChannel) < counterChannelSize {
+ counterChannel <- dataPoint
+ }
} else {
- counter.Add(ctx, 1)
+ glog.Error(err)
}
- } else {
- glog.Error(err)
}
}
-func covertTagsToOTELAttributes(tags []Tags) (attr []attribute.KeyValue) {
- attr = make([]attribute.KeyValue, len(tags))
+func covertTagsToOTELAttributes(tags []Tags) instrument.MeasurementOption {
+ attr := make([]attribute.KeyValue, len(tags))
for i := 0; i < len(tags); i++ {
attr[i] = attribute.String(tags[i].TagName, tags[i].TagValue)
}
- return
+ return instrument.WithAttributes(attr...)
}
func PopulateJunoMetricNamePrefix(metricName string) string {
return JUNO_METRIC_PREFIX + metricName
}
-// getEnvFromSyshieraYaml returns the env: line from /etc/syshiera.yaml
-func getEnvFromSyshieraYaml() (string, error) {
- filePath := "/etc/syshiera.yaml"
- file, err := os.Open(filePath)
- if err != nil {
- return "", err
- }
- defer file.Close()
- fileReader := bufio.NewReader(file)
- scanner := bufio.NewScanner(fileReader)
- for scanner.Scan() {
- line := scanner.Text()
- err = scanner.Err()
- if err != nil {
- if err == io.EOF {
- break
- }
- return "", err
- }
- pos := strings.Index(line, "pp_az: ")
- if pos == -1 {
- continue
- }
- return strings.TrimSpace(line[3:len(line)]), nil
- }
- err = errors.New("dc: not found in /etc/syshiera.yaml")
- return "", err
-}
-
func getResourceInfo(appName string) *resource.Resource {
- colo, _err := getEnvFromSyshieraYaml()
- if _err != nil {
- colo = "qa"
- }
hostname, _ := os.Hostname()
-
resource := resource.NewWithAttributes("empty resource",
- semconv.HostNameKey.String(hostname),
- semconv.HostTypeKey.String("BM"),
- semconv.ServiceNameKey.String(appName),
- attribute.String("az", colo),
+ attribute.String("host", hostname),
attribute.String("application", appName),
)
return resource
}
-// func NewGRPCExporter(ctx context.Context) (metric.Exporter, error) {
-// ctx, cancel := context.WithTimeout(ctx, time.Second*10)
-// defer cancel()
-
-// // Exponential back-off strategy.
-// backoffConf := backoff.DefaultConfig
-// // You can also change the base delay, multiplier, and jitter here.
-// backoffConf.MaxDelay = 240 * time.Second
-
-// conn, err := grpc.DialContext(
-// ctx,
-// string(DEFAULT_OTEL_COLLECTOR__IP+":"+DEFAULT_GRPC_OTEL_COLLECTOR_PORT),
-// grpc.WithInsecure(),
-// grpc.WithBlock(),
-// grpc.WithConnectParams(grpc.ConnectParams{
-// Backoff: backoffConf,
-// // Connection timeout.
-// MinConnectTimeout: 5 * time.Second,
-// }),
-// )
-// if err != nil {
-// return nil, err
-// }
-
-// return otlpmetricgrpc.New(ctx,
-// otlpmetricgrpc.WithGRPCConn(conn),
-// // WithTimeout sets the max amount of time the Exporter will attempt an
-// // export.
-// otlpmetricgrpc.WithTimeout(7*time.Second),
-// )
-// }
+func doWriteHistogram(histChannel chan DataPoint, doneCh chan bool, hist instrument.Int64Histogram) {
+ ctx := context.Background()
+ for {
+ select {
+ case dataPoint := <-histChannel:
+ hist.Record(ctx, dataPoint.data, dataPoint.attr)
+ case <-doneCh:
+ return
+ }
+ }
+}
+
+func doWriteCounter(counterChannel chan DataPoint, doneCh chan bool, count instrument.Int64Counter) {
+ ctx := context.Background()
+ for {
+ select {
+ case dataPoint := <-counterChannel:
+ if dataPoint.attr != nil {
+ count.Add(ctx, dataPoint.data, dataPoint.attr)
+ } else {
+ count.Add(ctx, dataPoint.data)
+ }
+ case <-doneCh:
+ return
+ }
+ }
+}
diff --git a/pkg/logging/otel/statsLogger.go b/pkg/logging/otel/statsLogger.go
index f93031f5..a0c9e7e4 100644
--- a/pkg/logging/otel/statsLogger.go
+++ b/pkg/logging/otel/statsLogger.go
@@ -1,194 +1,103 @@
+// Copyright 2023 PayPal Inc.
//
-// Copyright 2023 PayPal Inc.
+// 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
//
-// 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.
+// 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 otel
import (
"context"
"errors"
"fmt"
- "juno/pkg/stats"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"runtime"
"strconv"
- "sync"
- "time"
-
- "go.opentelemetry.io/otel/attribute"
- "go.opentelemetry.io/otel/metric/global"
- "go.opentelemetry.io/otel/metric/instrument"
- "go.opentelemetry.io/otel/metric/instrument/asyncfloat64"
-)
-
-const (
- MachineCpuUsed string = string("machineCpuUsed")
- ProcessCpuUsed string = string("machineCpuUsed")
- MachineMemoryUsed
- ProcessMemoryUsed
-)
-var (
- machineCpuUsedOnce sync.Once
- processCpuUsedOnce sync.Once
- machineMemoryUsedOnce sync.Once
- processMemoryUsedOnce sync.Once
- badShardOnce sync.Once
- alertShardOnce sync.Once
- warningShardOnce sync.Once
- keyCountOnce sync.Once
- freeStorageOnce sync.Once
- usedStorageOnce sync.Once
- LNLevelOnce sync.Once
- compSecOnce sync.Once
- compCountOnce sync.Once
- pendingCompOnce sync.Once
- stallOnce sync.Once
-)
+ "github.com/paypal/junodb/pkg/stats"
-var (
- machTime time.Time
- machCpuTick uint16
- machUser uint64
- machSystem uint64
+ "go.opentelemetry.io/otel/attribute"
+ "go.opentelemetry.io/otel/metric"
)
-type GaugeMetric struct {
- MetricName string
- metricDesc string
- gaugeMetric asyncfloat64.Gauge
- createGauge *sync.Once
- stype ServerType
-}
-
-var GaugeMetricMap map[string]*GaugeMetric = map[string]*GaugeMetric{
- "mCPU": {"machCpuUsed", "CPU utilization of the host", nil, &machineCpuUsedOnce, SvrTypeAll},
- "pCPU": {"procCpuUsed", "CPU utilization of individual Juno instance", nil, &processCpuUsedOnce, SvrTypeAll},
- "mMem": {"machMemUsed", "Memory utilization of the host", nil, &machineMemoryUsedOnce, SvrTypeAll},
- "pMem": {"procMemUsed", "Memory utilization of individual Juno instance", nil, &processMemoryUsedOnce, SvrTypeAll},
-
- "nBShd": {"badShard", "Number of bad shards", nil, &badShardOnce, SvrTypeProxy},
- "nAShd": {"alertShard", "number of shards with no redundancy", nil, &alertShardOnce, SvrTypeProxy},
- "nWShd": {"warningShard", "number of shards with bad SS", nil, &warningShardOnce, SvrTypeProxy},
-
- "keys": {"key_count", "Key Counte in rocksDB", nil, &keyCountOnce, SvrTypeStorage},
- "free": {"free_mb_storage_space", "Free Storage Space (mbytes)", nil, &freeStorageOnce, SvrTypeStorage},
- "used": {"storage_used_mb", "Used Storage Space (mbytes)", nil, &usedStorageOnce, SvrTypeStorage},
- "LN": {"LN_level", "Max LN Level in Rocksdb", nil, &LNLevelOnce, SvrTypeStorage},
- "compSec": {"comp_sec", "Compaction Sec", nil, &compSecOnce, SvrTypeStorage},
- "compCount": {"comp_count", "Compaction Count", nil, &compCountOnce, SvrTypeStorage},
- "pCompKB": {"pending_comp_kbytes", "Pending Compaction KBytes", nil, &pendingCompOnce, SvrTypeStorage},
- "stall": {"stall_write_rate", "Actural Delayed Write Rate", nil, &stallOnce, SvrTypeStorage},
-}
-
-// Represents the list of workers with stats
-type CurrentStatsData struct {
- WorkerState []WorkerStats
-}
-
-// Represents list of stats emitted by a worker
-type WorkerStats struct {
- StatData []StateData
-}
-
-// Represents stats by worker
-type StateData struct {
- Name string
- Value float64
- Dimensions []attribute.KeyValue
-}
-
-var CurrStatsData CurrentStatsData
-
func InitSystemMetrics(serverType ServerType, workerStats [][]stats.IState) {
- meter := global.Meter(MeterName)
- var stateLogGauge []instrument.Asynchronous = make([]instrument.Asynchronous, len(GaugeMetricMap))
- var i int = 0
- //InitMachCpuUsage()
- for _, element := range GaugeMetricMap {
+ meter := meterProvider.Meter(MeterName)
+ var metricList []metric.Observable = make([]metric.Observable, 0, len(GaugeMetricList))
+ for _, element := range GaugeMetricList {
if element.stype == serverType || element.stype == SvrTypeAll {
element.createGauge.Do(func() {
- // TODO instead of element use GaugeMetricMap[index]
- element.gaugeMetric, _ = meter.AsyncFloat64().Gauge(
+ var err error
+ element.gaugeMetric, err = meter.Float64ObservableGauge(
PopulateJunoMetricNamePrefix(element.MetricName),
- //instrument.WithUnit(unit.Dimensionless),
- instrument.WithDescription(element.metricDesc),
+ metric.WithDescription(element.metricDesc),
)
- stateLogGauge[i] = element.gaugeMetric
- i++
+ metricList = append(metricList, element.gaugeMetric)
+ if err != nil {
+ glog.Error("FloatObservable creation failed : ", err.Error())
+ }
})
}
}
- if err := meter.RegisterCallback(
- stateLogGauge,
- func(ctx context.Context) {
- wstate := getMetricData(workerStats)
- for _, workerState := range wstate {
- for _, state := range workerState.StatData {
- gMetric, ok := GaugeMetricMap[state.Name]
- if ok {
- if gMetric.gaugeMetric != nil {
- gMetric.gaugeMetric.Observe(ctx, state.Value, state.Dimensions...)
- }
- }
+ if _, err := meter.RegisterCallback(func(_ context.Context, o metric.Observer) error {
+ getMetricData(workerStats)
+ for _, metric := range GaugeMetricList {
+ if metric.gaugeMetric != nil {
+ for _, stat := range metric.stats {
+ o.ObserveFloat64(metric.gaugeMetric, stat.Value, stat.Dimensions)
}
}
- },
- ); err != nil {
- ///Just ignore
+ }
+ return nil
+ }, metricList...); err != nil {
+ glog.Error("Error Registering call back : ", err.Error())
}
+
}
-func getMetricData(workerStats [][]stats.IState) []WorkerStats {
+func getMetricData(workerStats [][]stats.IState) {
numWorkers := len(workerStats)
- var wsd []WorkerStats
- wsd = make([]WorkerStats, numWorkers)
- for wi := 0; wi < numWorkers; wi++ { // For number of workers
- var sdata []StateData
- sdata = make([]StateData, 0, len(workerStats[wi]))
- for _, v := range workerStats[wi] { // For number of statistics
- if fl, err := strconv.ParseFloat(v.State(), 64); err == nil {
- if wrstats, err := writeMetricsData(wi, v.Header(), fl); err == nil {
- sdata = append(sdata, wrstats)
+ for _, metric := range GaugeMetricList {
+ if metric.gaugeMetric != nil {
+ metric.stats = make([]StateData, 0, numWorkers)
+ for wi := 0; wi < numWorkers; wi++ { // For number of workers
+ for _, v := range workerStats[wi] { // For number of statistics
+ if metric.MetricShortName == v.Header() {
+ if fl, err := strconv.ParseFloat(v.State(), 64); err == nil {
+ if wrstats, err := writeMetricsData(wi, v.Header(), fl); err == nil {
+ metric.stats = append(metric.stats, wrstats)
+ }
+ }
+ }
}
}
}
- wsd[wi].StatData = sdata
}
-
- return wsd
+ return
}
func writeMetricsData(wid int, key string, value float64) (StateData, error) {
var data StateData
- _, ok := GaugeMetricMap[key]
- if !ok {
- // Only record the metrics in the map
- return data, errors.New("Metirc not found in Map")
- }
- if (key == "mCPU" || key == "mMem") && wid != 0 {
+ if (key == "free" || key == "used") && wid != 0 {
// Log system metric only for worker 0
return data, errors.New("Do not log machine resource utilization for all workers except for worker 0")
}
data.Name = key
data.Value = value
- data.Dimensions = []attribute.KeyValue{attribute.String("id", fmt.Sprintf("%d", wid))}
+ data.Dimensions = metric.WithAttributes(attribute.String("id", fmt.Sprintf("%d", wid)))
return data, nil
}
diff --git a/pkg/logging/otel/test/logger_test.go b/pkg/logging/otel/test/logger_test.go
index f8117449..555ec431 100644
--- a/pkg/logging/otel/test/logger_test.go
+++ b/pkg/logging/otel/test/logger_test.go
@@ -19,15 +19,16 @@
// This test uses a mock to validate the metrics and the sends the metric to
// QA OTEL collector for verifying the results in Sfx UI.
-package test
+package otel
import (
"fmt"
- "juno/pkg/logging/otel"
- config "juno/pkg/logging/otel/config"
- "juno/pkg/stats"
"testing"
"time"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/logging/otel"
+ config "github.com/paypal/junodb/pkg/logging/otel/config"
+ "github.com/paypal/junodb/pkg/stats"
)
var exportinterval int = 10
@@ -50,13 +51,13 @@ func TestJunoOperation(t *testing.T) {
time.Sleep(time.Duration(1) * time.Second)
- otel.RecordOperation("Create", "SUCCESS", 2000)
- otel.RecordOperation("Get", "SUCCESS", 1000)
- otel.RecordOperation("Update", "SUCCESS", 3000)
- otel.RecordOperation("Destroy", "SUCCESS", 500)
- otel.RecordOperation("Set", "SUCCESS", 2500)
+ otel.RecordOperation("Create", proto.OpStatusNoError, 2000)
+ otel.RecordOperation("Get", proto.OpStatusNoError, 1000)
+ otel.RecordOperation("Update", proto.OpStatusNoError, 3000)
+ otel.RecordOperation("Destroy", proto.OpStatusNoError, 500)
+ otel.RecordOperation("Set", proto.OpStatusNoError, 2500)
- otel.RecordOperation("Create", "ERROR", 2000)
+ otel.RecordOperation("Create", proto.OpStatusBadParam, 2000)
time.Sleep(time.Duration(SfxConfig.Resolution) * time.Second)
@@ -357,14 +358,14 @@ func TestJunoStats(t *testing.T) {
for i := 0; i < 2; i++ {
workerStats[i] = append(workerStats[i],
[]stats.IState{
- stats.NewUint32State(&mcpu, "mCPU", "Machine CPU usage"),
+ stats.NewUint32State(&mcpu, "pCPU", "Process CPU usage"),
stats.NewUint16State(&bshd, "nBShd", "number of Bad Shards"),
}...)
}
otel.InitSystemMetrics(otel.SvrTypeProxy, workerStats)
- time.Sleep(time.Duration(SfxConfig.Resolution) * time.Second)
+ time.Sleep(time.Duration(SfxConfig.Resolution+10) * time.Second)
v1m := mc.GetMetrics()
@@ -372,11 +373,11 @@ func TestJunoStats(t *testing.T) {
t.Errorf("Test fail")
} else {
for i := 0; i < 2; i++ {
- if v1m[i].GetName() == "juno.server.machCpuUsed" {
+ if v1m[i].GetName() == "pp.juno.server.proc_cpu_used" {
if v1m[i].GetGauge().DataPoints[0].GetAsDouble() != 30 {
t.Errorf("CPU utilization is incorrect %f", v1m[i].GetGauge().DataPoints[0].GetAsDouble())
}
- } else if v1m[i].GetName() == "juno.server.badShard" {
+ } else if v1m[i].GetName() == "pp.juno.server.bad_shard" {
if v1m[i].GetGauge().DataPoints[0].GetAsDouble() != 5 {
t.Errorf("Bad Shard Count is incorrect %f", v1m[i].GetGauge().DataPoints[0].GetAsDouble())
}
diff --git a/pkg/logging/otel/test/mock_collector.go b/pkg/logging/otel/test/mock_collector.go
index 5b29af06..fc8c1989 100644
--- a/pkg/logging/otel/test/mock_collector.go
+++ b/pkg/logging/otel/test/mock_collector.go
@@ -16,7 +16,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-package test
+package otel
import (
"bytes"
@@ -31,6 +31,7 @@ import (
"encoding/pem"
"fmt"
"io"
+ "io/ioutil"
"math/big"
mathrand "math/rand"
"net"
@@ -112,7 +113,7 @@ func (c *mockCollector) serveMetrics(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
return
}
-
+ // fmt.Println("---------------raw req--------------", rawRequest)
request, err := unmarshalMetricsRequest(rawRequest, r.Header.Get("content-type"))
if err != nil {
w.WriteHeader(http.StatusBadRequest)
@@ -122,7 +123,7 @@ func (c *mockCollector) serveMetrics(w http.ResponseWriter, r *http.Request) {
c.spanLock.Lock()
defer c.spanLock.Unlock()
- // fmt.Println("---------------serveMetrics--------------", request)
+ fmt.Println("---------------serveMetrics--------------", request)
c.metricsStorage.AddMetrics(request)
}
@@ -161,7 +162,7 @@ func readRequest(r *http.Request) ([]byte, error) {
if r.Header.Get("Content-Encoding") == "gzip" {
return readGzipBody(r.Body)
}
- return io.ReadAll(r.Body)
+ return ioutil.ReadAll(r.Body)
}
func readGzipBody(body io.Reader) ([]byte, error) {
@@ -334,8 +335,13 @@ func NewMetricsStorage() MetricsStorage {
func (s *MetricsStorage) AddMetrics(request *collectormetricpb.ExportMetricsServiceRequest) {
for _, rm := range request.GetResourceMetrics() {
// TODO (rghetia) handle multiple resource and library info.
+ fmt.Println("---------------AddMetrics------------------", rm)
+
if len(rm.ScopeMetrics) > 0 {
s.metrics = append(s.metrics, rm.ScopeMetrics[0].Metrics...)
+ fmt.Println("Metric added successfully")
+ } else {
+ fmt.Println("Metrics added filed")
}
// if len(rm.InstrumentationLibraryMetrics) > 0 {
diff --git a/pkg/net/netutil/netutil.go b/pkg/net/netutil/netutil.go
index 03665f71..90c46f8c 100644
--- a/pkg/net/netutil/netutil.go
+++ b/pkg/net/netutil/netutil.go
@@ -22,7 +22,7 @@ package netutil
import (
"net"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/pkg/proto/cryptoks.go b/pkg/proto/cryptoks.go
index 71f04d14..8cf9a153 100644
--- a/pkg/proto/cryptoks.go
+++ b/pkg/proto/cryptoks.go
@@ -24,7 +24,7 @@ import (
"errors"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type (
diff --git a/pkg/proto/decode.go b/pkg/proto/decode.go
index 2273be5d..43baccbe 100644
--- a/pkg/proto/decode.go
+++ b/pkg/proto/decode.go
@@ -22,9 +22,9 @@ package proto
import (
"io"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
const (
@@ -69,7 +69,7 @@ func (dec *Decoder) Decode(op *OperationalMessage) error {
return op.decode(raw, &header, true)
}
-//Caller's responsibility to have op zeroed
+// Caller's responsibility to have op zeroed
func (op *OperationalMessage) decode(raw []byte, msgHeader *messageHeaderT, copyData bool) error {
offset := 0
szBuf := len(raw)
diff --git a/pkg/proto/mayfly/mapping.go b/pkg/proto/mayfly/mapping.go
index b9d292c8..f4d8ab99 100644
--- a/pkg/proto/mayfly/mapping.go
+++ b/pkg/proto/mayfly/mapping.go
@@ -23,9 +23,9 @@ import (
"encoding/binary"
"net"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
func opCodeToJuno(mfop OpCode) (opcode proto.OpCode, err error) {
@@ -69,7 +69,7 @@ func toMayflyOpCode(jop proto.OpCode) (opcode OpCode, err error) {
return
}
-///TODO to be reviewed
+// /TODO to be reviewed
var opStatusJunoToMayflyMapping []OpStatus = []OpStatus{
OpStatusdNoError, //Ok, 0
OpStatusBadMsg, //BadMsg, 1
diff --git a/pkg/proto/mayfly/msg.go b/pkg/proto/mayfly/msg.go
index 97b52762..643af4d7 100644
--- a/pkg/proto/mayfly/msg.go
+++ b/pkg/proto/mayfly/msg.go
@@ -25,7 +25,7 @@ import (
"fmt"
"io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
type Msg struct {
diff --git a/pkg/proto/mayfly/msg_test.go b/pkg/proto/mayfly/msg_test.go
index 46dbca45..1988eff9 100644
--- a/pkg/proto/mayfly/msg_test.go
+++ b/pkg/proto/mayfly/msg_test.go
@@ -23,7 +23,7 @@ import (
"bytes"
"testing"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
func testRequestResponse(t *testing.T, rawRequest []byte, rawResponse []byte) {
diff --git a/pkg/proto/mayfly/opmsg.go b/pkg/proto/mayfly/opmsg.go
index a1eddce7..8a3c4b7c 100644
--- a/pkg/proto/mayfly/opmsg.go
+++ b/pkg/proto/mayfly/opmsg.go
@@ -30,8 +30,8 @@ import (
"sync/atomic"
"time"
- "juno/pkg/net/netutil"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/net/netutil"
+ "github.com/paypal/junodb/pkg/util"
)
type (
diff --git a/pkg/proto/metaField.go b/pkg/proto/metaField.go
index aace1d4c..c5f45776 100644
--- a/pkg/proto/metaField.go
+++ b/pkg/proto/metaField.go
@@ -18,53 +18,53 @@
//
/*
- ==============================
- *** Predefined Field Types ***
- ==============================
-
- Tag/ID | Field | SizeType
- -------+--------------------------------------+------
- 0x01 | TimeToLive | 0x01
- 0x02 | Version | 0x01
- 0x03 | Creation Time | 0x01
- 0x04 | Expiration Time | 0x01
- 0x05 | RequestID/UUID | 0x03
- 0x06 | Source Info | 0
- 0x07 | Last Modification time (nano second) | 0x02
- 0x08 | Originator RequestID/UUID | 0x03
- 0x09 | Correlation ID | 0
- 0x0a | RequestHandlingTime | 0x01
- 0x0b | UDF Name | 0
- -------+--------------------------------------+------
-
-
- Tag/ID: 0x06
- +-----------------------------------------------------------------------------------------------+
- | 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7|
- | 0| 1| 2| 3|
- +-----------+-----------+--------------------+--+-----------------------+-----------------------+
- | size (include padding)| app name length | T| Port |
- +-----------------------+--------------------+--+-----------------------------------------------+
- | IPv4 address if T is 0 or IPv6 address if T is 1 |
- +-----------------------------------------------------------------------------------------------+
- | application name, padding to 4-byte aligned |
- +-----------------------------------------------------------------------------------------------+
-
- Tag/ID: 0x09; 0x0b
- +----+-------------------------------------------
- | 0 | field size (including padding)
- +----+-------------------------------------------
- | 1 | octet sequence length
- +----+-------------------------------------------
- | | octet sequence, padding to 4-byte aligned
- +----+-------------------------------------------
+ ==============================
+ *** Predefined Field Types ***
+ ==============================
+
+ Tag/ID | Field | SizeType
+ -------+--------------------------------------+------
+ 0x01 | TimeToLive | 0x01
+ 0x02 | Version | 0x01
+ 0x03 | Creation Time | 0x01
+ 0x04 | Expiration Time | 0x01
+ 0x05 | RequestID/UUID | 0x03
+ 0x06 | Source Info | 0
+ 0x07 | Last Modification time (nano second) | 0x02
+ 0x08 | Originator RequestID/UUID | 0x03
+ 0x09 | Correlation ID | 0
+ 0x0a | RequestHandlingTime | 0x01
+ 0x0b | UDF Name | 0
+ -------+--------------------------------------+------
+
+
+ Tag/ID: 0x06
+ +-----------------------------------------------------------------------------------------------+
+ | 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7| 0| 1| 2| 3| 4| 5| 6| 7|
+ | 0| 1| 2| 3|
+ +-----------+-----------+--------------------+--+-----------------------+-----------------------+
+ | size (include padding)| app name length | T| Port |
+ +-----------------------+--------------------+--+-----------------------------------------------+
+ | IPv4 address if T is 0 or IPv6 address if T is 1 |
+ +-----------------------------------------------------------------------------------------------+
+ | application name, padding to 4-byte aligned |
+ +-----------------------------------------------------------------------------------------------+
+
+ Tag/ID: 0x09; 0x0b
+ +----+-------------------------------------------
+ | 0 | field size (including padding)
+ +----+-------------------------------------------
+ | 1 | octet sequence length
+ +----+-------------------------------------------
+ | | octet sequence, padding to 4-byte aligned
+ +----+-------------------------------------------
*/
package proto
import (
"net"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// Meta Component Field Tag
@@ -173,7 +173,7 @@ func (t requestHandlingTimeT) tagAndSizeTypeByte() uint8 {
return kFieldTagRequestHandlingTime | kMetaField_4Bytes
}
-//uint64 meta field
+// uint64 meta field
func (t uint64T) isSet() bool {
return t != 0
}
@@ -212,7 +212,7 @@ func (t lastModificationTimeT) tagAndSizeTypeByte() uint8 {
return kFieldTagLastModificationTime | kMetaField_8Bytes
}
-//16-byte meta field
+// 16-byte meta field
func (t *requestIdBaseT) value() []byte {
return t.Bytes()
}
@@ -270,7 +270,7 @@ func (t *originatorT) tagAndSizeTypeByte() uint8 {
return kFieldTagOriginatorRequestID | kMetaField_16Bytes
}
-//sourceinfo
+// sourceinfo
func (t *sourceInfoT) isSet() bool {
if (len(t.ip) != 0) || (t.port != 0) || (len(t.appName) != 0) {
return true
@@ -379,7 +379,7 @@ func (t sourceInfoT) tagAndSizeTypeByte() uint8 {
return kFieldTagSourceInfo | kMetaFieldVariableSize
}
-//byte sequence
+// byte sequence
func (t byteSequenceT) isSet() bool {
return len(t) != 0
}
diff --git a/pkg/proto/opMsg.go b/pkg/proto/opMsg.go
index 74ddd893..f2616587 100644
--- a/pkg/proto/opMsg.go
+++ b/pkg/proto/opMsg.go
@@ -27,7 +27,7 @@ import (
uuid "github.com/satori/go.uuid"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
)
type OperationalMessage struct {
diff --git a/pkg/proto/opMsg_test.go b/pkg/proto/opMsg_test.go
index 555a03b4..fd4946a4 100644
--- a/pkg/proto/opMsg_test.go
+++ b/pkg/proto/opMsg_test.go
@@ -23,8 +23,9 @@ import (
"bytes"
"encoding/binary"
"fmt"
- "juno/pkg/util"
"testing"
+
+ "github.com/paypal/junodb/pkg/util"
)
func testRequestResponse(t *testing.T, rawRequest []byte, rawResponse []byte) {
diff --git a/pkg/proto/payload.go b/pkg/proto/payload.go
index e1bf4bdf..ae61c152 100644
--- a/pkg/proto/payload.go
+++ b/pkg/proto/payload.go
@@ -28,9 +28,9 @@ import (
"fmt"
"io"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/util"
"github.com/golang/snappy"
)
@@ -106,7 +106,7 @@ func (p *Payload) SetWithClearValue(value []byte) {
p.data = value
}
-///TODO
+// /TODO
func (p *Payload) GetClearValue() (value []byte, err error) {
if p.GetLength() == 0 {
return
diff --git a/pkg/proto/rawmessage.go b/pkg/proto/rawmessage.go
index 5fb11782..ea2e7e6e 100644
--- a/pkg/proto/rawmessage.go
+++ b/pkg/proto/rawmessage.go
@@ -23,10 +23,10 @@ import (
"bytes"
"io"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/debug"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/debug"
+ "github.com/paypal/junodb/pkg/util"
)
type RawMessage struct {
@@ -95,9 +95,7 @@ func (m *RawMessage) allocateBuffer(size int) {
m.body = m.buf.Bytes()
}
-//
// Note: read timeout is set at conn level
-//
func (msg *RawMessage) Read(r io.Reader) (n int, err error) {
var hBuffer [kMessageHeaderSize]byte
@@ -152,9 +150,7 @@ func (msg *RawMessage) ReadWithHeader(header []byte, r io.Reader) (n int, err er
return
}
-//
// Note: this api is not thread safe
-//
func (m *RawMessage) Write(w io.Writer) (n int, err error) {
var mheader [kMessageHeaderSize]byte
raw := mheader[:]
diff --git a/pkg/sec/certs.go b/pkg/sec/certs.go
index cacc680e..fa0b4666 100644
--- a/pkg/sec/certs.go
+++ b/pkg/sec/certs.go
@@ -20,8 +20,9 @@
package sec
import (
- "juno/third_party/forked/golang/glog"
"os"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type localFileProtectedT struct {
diff --git a/pkg/sec/certs_test.go b/pkg/sec/certs_test.go
index a1a39e0b..d598b285 100644
--- a/pkg/sec/certs_test.go
+++ b/pkg/sec/certs_test.go
@@ -20,10 +20,11 @@
package sec
import (
- "juno/third_party/forked/golang/glog"
"os"
"reflect"
"testing"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
// Sample secrets crt, not a real crt
diff --git a/pkg/sec/gotlsimpl.go b/pkg/sec/gotlsimpl.go
index 47b026a5..07d7a4fa 100644
--- a/pkg/sec/gotlsimpl.go
+++ b/pkg/sec/gotlsimpl.go
@@ -27,9 +27,10 @@ import (
"time"
"crypto/tls"
- "juno/third_party/forked/golang/glog"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/pkg/proto"
)
type (
@@ -67,6 +68,108 @@ func (c *TlsConn) GetStateString() string {
return statStr
}
+func (c *TlsConn) GetTLSVersion() string {
+ if c.conn != nil {
+ stat := c.conn.ConnectionState()
+ return GetVersionName(stat.Version)
+ }
+ return "none"
+}
+
+func GetVersionName(ver uint16) string {
+ switch ver {
+ case tls.VersionTLS10:
+ return "TLSv1"
+ case tls.VersionTLS11:
+ return "TLSv1.1"
+ case tls.VersionTLS12:
+ return "TLSv1.2"
+ case tls.VersionTLS13:
+ return "TLSv1.3"
+ default:
+ return ""
+ }
+}
+
+func (c *TlsConn) GetCipherName() string {
+ if c.conn != nil {
+ stat := c.conn.ConnectionState()
+ return GetCipherName(stat.CipherSuite)
+ }
+ return "none"
+}
+
+func GetCipherName(cipher uint16) string {
+ switch cipher {
+ case tls.TLS_RSA_WITH_RC4_128_SHA:
+ return "RSA-RC4-128-SHA"
+ case tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
+ return "RSA-3DES-EDE-CBC-SHA"
+ case tls.TLS_RSA_WITH_AES_128_CBC_SHA:
+ return "AES128-SHA"
+ case tls.TLS_RSA_WITH_AES_256_CBC_SHA:
+ return "AES256-SHA"
+ case tls.TLS_RSA_WITH_AES_128_CBC_SHA256:
+ return "RSA-AES-128-CBC-SHA256"
+ case tls.TLS_RSA_WITH_AES_128_GCM_SHA256:
+ return "RSA-AES-128-GCM-SHA256"
+ case tls.TLS_RSA_WITH_AES_256_GCM_SHA384:
+ return "RSA-AES-256-GCM-SHA384"
+ case tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
+ return "ECDHE_ECDSA_RC4_128_SHA"
+ case tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
+ return "ECDHE_ECDSA_AES128_CBC_SHA"
+ case tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
+ return "ECDHE_ECDSA_AES_256_CBC_SHA"
+ case tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
+ return "ECDHE_RSA_RC4_128_SHA"
+ case tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
+ return "ECDHE_RSA_3DES_EDE_CBC_SHA"
+ case tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
+ return "ECDHE_RSA_AES128_CBC_SHA"
+ case tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
+ return "ECDHE_RSA_AES_256_CBC_SHA"
+ case tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
+ return "ECDHE_ECDSA_AES128_CBC_SHA256"
+ case tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
+ return "ECDHE_RSA_AES128_CBC_SHA256"
+ case tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
+ return "ECDHE_RSA_AES128_GCM_SHA256"
+ case tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
+ return "ECDHE_ECDSA_AES128_GCM_SHA256"
+ case tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
+ return "ECDHE_RSA_AES256_GCM_SHA384"
+ case tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
+ return "ECDHE_ECDSA_AES256_GCM_SHA384"
+ case tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305:
+ return "ECDHE_RSA_CHACHA20_POLY1305"
+ case tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305:
+ return "ECDHE_ECDSA_CHACHA20_POLY1305"
+ case tls.TLS_AES_128_GCM_SHA256:
+ return "TLS_AES_128_GCM_SHA256"
+ case tls.TLS_AES_256_GCM_SHA384:
+ return "TLS_AES_256_GCM_SHA384"
+ case tls.TLS_CHACHA20_POLY1305_SHA256:
+ return "TLS_CHACHA20_POLY1305_SHA256"
+ case tls.TLS_FALLBACK_SCSV:
+ return "TLS_FALLBACK_SCSV"
+ default:
+ return "unknown"
+ }
+}
+
+func (c *TlsConn) DidResume() string {
+ if c.conn != nil {
+ stat := c.conn.ConnectionState()
+ if stat.DidResume {
+ return "Yes"
+ } else {
+ return "No"
+ }
+ }
+ return "No"
+}
+
func (c *TlsConn) IsServer() bool {
return c.isServer
}
diff --git a/pkg/sec/keystore.go b/pkg/sec/keystore.go
index ba29de85..d7728d7e 100644
--- a/pkg/sec/keystore.go
+++ b/pkg/sec/keystore.go
@@ -23,10 +23,11 @@ import (
"encoding/hex"
"errors"
"fmt"
- "juno/pkg/proto"
- "juno/third_party/forked/golang/glog"
"time"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
"github.com/BurntSushi/toml"
)
diff --git a/pkg/sec/keystore_test.go b/pkg/sec/keystore_test.go
index 3a8c0389..3e7eb737 100644
--- a/pkg/sec/keystore_test.go
+++ b/pkg/sec/keystore_test.go
@@ -20,10 +20,11 @@
package sec
import (
- "juno/pkg/proto"
"os"
"reflect"
"testing"
+
+ "github.com/paypal/junodb/pkg/proto"
)
var tomlData = []byte(`# Sample Keystore
diff --git a/pkg/sec/seccfg.go b/pkg/sec/seccfg.go
index b57344a2..883d147a 100644
--- a/pkg/sec/seccfg.go
+++ b/pkg/sec/seccfg.go
@@ -23,7 +23,7 @@ import (
"fmt"
"sync/atomic"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/pkg/sec/secinit.go b/pkg/sec/secinit.go
index 1817dcc6..4733936c 100644
--- a/pkg/sec/secinit.go
+++ b/pkg/sec/secinit.go
@@ -23,12 +23,12 @@ import (
"fmt"
"sync"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/initmgr"
- "juno/pkg/logging"
- "juno/pkg/logging/cal"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/initmgr"
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/proto"
)
const (
@@ -60,10 +60,10 @@ var (
type Flag uint8
/*
- Two arguments required
- arg 0: *Config
- arg 1: uint8 bitmask flag
- arg 2: isServerManager (optional)
+Two arguments required
+arg 0: *Config
+arg 1: uint8 bitmask flag
+arg 2: isServerManager (optional)
*/
func Initialize(args ...interface{}) (err error) {
var cfg *Config
diff --git a/pkg/sec/sslctx.go b/pkg/sec/sslctx.go
index 1dfa0bde..0b4af3ed 100644
--- a/pkg/sec/sslctx.go
+++ b/pkg/sec/sslctx.go
@@ -28,6 +28,9 @@ import (
type (
Conn interface {
GetStateString() string
+ GetTLSVersion() string
+ GetCipherName() string
+ DidResume() string
IsServer() bool
Handshake() error
GetNetConn() net.Conn
diff --git a/pkg/service/servermgr.go b/pkg/service/servermgr.go
index 53f0bad6..d6182581 100644
--- a/pkg/service/servermgr.go
+++ b/pkg/service/servermgr.go
@@ -28,7 +28,7 @@ import (
"strings"
"syscall"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type (
diff --git a/pkg/service/service.go b/pkg/service/service.go
index 96629915..2dff0053 100644
--- a/pkg/service/service.go
+++ b/pkg/service/service.go
@@ -27,10 +27,10 @@ import (
"sync/atomic"
"syscall"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/io"
- "juno/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging/cal"
)
type Service struct {
diff --git a/pkg/service/svccfg.go b/pkg/service/svccfg.go
index fc808cf5..b1971d01 100644
--- a/pkg/service/svccfg.go
+++ b/pkg/service/svccfg.go
@@ -24,8 +24,8 @@ import (
"strings"
"time"
- "juno/pkg/io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
)
const (
diff --git a/pkg/stats/appnsstats.go b/pkg/stats/appnsstats.go
index 44230817..9a2ffbe9 100644
--- a/pkg/stats/appnsstats.go
+++ b/pkg/stats/appnsstats.go
@@ -23,7 +23,7 @@ import (
"sync"
"sync/atomic"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
const (
diff --git a/pkg/stats/redist/stats.go b/pkg/stats/redist/stats.go
index 8674f88c..02a10b64 100644
--- a/pkg/stats/redist/stats.go
+++ b/pkg/stats/redist/stats.go
@@ -21,12 +21,13 @@ package redist
import (
"fmt"
- "juno/pkg/logging"
- "juno/pkg/util"
"strconv"
"strings"
"sync/atomic"
"time"
+
+ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/util"
)
var (
diff --git a/pkg/stats/sharedstats.go b/pkg/stats/sharedstats.go
index 9d9d7e35..2563ec89 100644
--- a/pkg/stats/sharedstats.go
+++ b/pkg/stats/sharedstats.go
@@ -23,9 +23,9 @@ import (
"fmt"
"os"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/shm"
+ "github.com/paypal/junodb/pkg/shm"
)
type (
diff --git a/pkg/stats/statelog.go b/pkg/stats/statelog.go
index 214cacd0..0a368273 100644
--- a/pkg/stats/statelog.go
+++ b/pkg/stats/statelog.go
@@ -28,9 +28,9 @@ import (
"time"
"unsafe"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/proto"
)
const (
diff --git a/pkg/udf/udfmgr_test.go b/pkg/udf/udfmgr_test.go
index d1aca400..ed35ea09 100644
--- a/pkg/udf/udfmgr_test.go
+++ b/pkg/udf/udfmgr_test.go
@@ -21,7 +21,8 @@ package udf
import (
"encoding/binary"
- "juno/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"fmt"
"testing"
diff --git a/pkg/udf/udfplugin.go b/pkg/udf/udfplugin.go
index 80a8e5a1..fcd3dc6e 100644
--- a/pkg/udf/udfplugin.go
+++ b/pkg/udf/udfplugin.go
@@ -26,7 +26,7 @@ import (
"plugin"
"strings"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func loadOneUDFbyName(dir string, name string) (iudf IUDF, err error) {
diff --git a/pkg/util/cmap.go b/pkg/util/cmap.go
index 7d32db7e..762d5778 100644
--- a/pkg/util/cmap.go
+++ b/pkg/util/cmap.go
@@ -20,9 +20,10 @@
package util
import (
- "github.com/spaolacci/murmur3"
- "juno/third_party/forked/golang/glog"
"sync"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/spaolacci/murmur3"
)
type MapPartition struct {
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 36f49f8c..028fb4fe 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -27,7 +27,7 @@ import (
"path/filepath"
"runtime"
- "juno/pkg/debug"
+ "github.com/paypal/junodb/pkg/debug"
)
var (
diff --git a/script/deploy.sh b/script/deploy.sh
index 27733dc3..4261eef6 100755
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -54,12 +54,7 @@ do
$i/shutdown.sh
fi
- if [ $i != "junoclustercfg" ]; then
- cp $BUILDTOP/package_config/package/${i}/script/shutdown.sh $i
- cp $BUILDTOP/package_config/package/${i}/script/start.sh $i
- fi
-
- cp $BUILDTOP/package_config/package/${i}/script/postinstall.sh $i
+ cp $BUILDTOP/package_config/package/${i}/script/*.sh $i
cp $BUILDTOP/package_config/script/postuninstall.sh $i
cp $BUILDTOP/package_config/script/logstate.sh $i
cp $BUILDTOP/package_config/script/log.sh $i
diff --git a/test/drv/bulkload/bulkload.go b/test/drv/bulkload/bulkload.go
index 066d6c28..f7460e3f 100644
--- a/test/drv/bulkload/bulkload.go
+++ b/test/drv/bulkload/bulkload.go
@@ -21,7 +21,7 @@
//
// Tool to create a set of random keys, which can be accessed by
// [-get|-update|-set|-delete] in a subsequent command.
-//=================================================================
+// =================================================================
package main
import (
@@ -35,10 +35,10 @@ import (
"strings"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/util"
)
type CmdLine struct {
diff --git a/test/drv/junoload/dbstats.go b/test/drv/junoload/dbstats.go
index ed8b5f24..8cf414b8 100644
--- a/test/drv/junoload/dbstats.go
+++ b/test/drv/junoload/dbstats.go
@@ -22,10 +22,10 @@ package main
import (
"fmt"
- "juno/third_party/forked/golang/glog"
- "juno/third_party/forked/tecbot/gorocksdb"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
- stor "juno/cmd/storageserv/storage/db"
+ stor "github.com/paypal/junodb/cmd/storageserv/storage/db"
)
func PrintDbStats(name string) {
diff --git a/test/drv/junoload/junoload.go b/test/drv/junoload/junoload.go
index 9297f651..ea3f2aa9 100644
--- a/test/drv/junoload/junoload.go
+++ b/test/drv/junoload/junoload.go
@@ -24,20 +24,23 @@ import (
"fmt"
"math/rand"
"net/http"
+ _ "net/http/pprof"
"os"
+ "strconv"
"strings"
"sync"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- "juno/pkg/client"
- "juno/pkg/cmd"
- "juno/pkg/logging/cal"
- "juno/pkg/sec"
- "juno/pkg/version"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cmd"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/pkg/version"
)
type (
@@ -75,6 +78,8 @@ type (
logLevel string
isVariable bool
disableGetTTL bool
+ keys string
+ randomize bool
}
)
@@ -96,6 +101,7 @@ const (
func (d *SyncTestDriver) setDefaultConfig() {
d.config.SetDefault()
+
d.config.Sec = sec.DefaultConfig
d.config.Cal.Default()
d.config.Cal.Poolname = "junoload"
@@ -112,6 +118,9 @@ func (d *SyncTestDriver) setDefaultConfig() {
d.config.StatOutputRate = kDefaultStatOutputRate
d.config.isVariable = false
d.config.disableGetTTL = false
+ d.config.sKey = -1
+ d.config.eKey = -1
+ d.config.randomize = false
}
func (d *SyncTestDriver) Init(name string, desc string) {
@@ -141,6 +150,8 @@ func (d *SyncTestDriver) Init(name string, desc string) {
d.StringOption(&d.cmdOpts.dbpath, "dbpath", "", "to display rocksdb stats")
d.StringOption(&d.cmdOpts.logLevel, "log-level", "info", "specify log level")
d.BoolOption(&d.cmdOpts.disableGetTTL, "disableGetTTL", false, "not use random ttl for get operation")
+ d.StringOption(&d.cmdOpts.keys, "keys", "", "key strange, separated with ,")
+ d.BoolOption(&d.cmdOpts.randomize, "r|randomize", false, "randomize, get/update/delete")
t := &SyncTestDriver{}
t.setDefaultConfig()
@@ -160,7 +171,28 @@ func (d *SyncTestDriver) Init(name string, desc string) {
d.AddExample(name+" -s 127.0.0.1:8080 -ssl",
"\trun the driver with SSL")
d.AddExample(name+" -c config.toml", "\trun the driver with options specified in config.toml")
+}
+
+func parseKeys(key string) (start int, last int) {
+ var err error
+ list := strings.Split(key, ",")
+ start, err = strconv.Atoi(list[0])
+ if err != nil {
+ glog.Exitf("%s", err)
+ }
+ if len(list) < 2 {
+ last = start + 1
+ } else {
+ last, err = strconv.Atoi(list[1])
+ if err != nil {
+ glog.Exitf("%s", err)
+ }
+ }
+ if start < 0 || last < 0 {
+ glog.Exitf("Negative range params are not allowed.")
+ }
+ return
}
func (d *SyncTestDriver) Parse(args []string) (err error) {
@@ -235,6 +267,14 @@ func (d *SyncTestDriver) Parse(args []string) (err error) {
d.config.HttpMonAddr = ":" + d.config.HttpMonAddr
}
+ if d.cmdOpts.keys != "" {
+ start, end := parseKeys(d.cmdOpts.keys)
+ d.config.sKey = int64(start)
+ d.config.eKey = int64(end)
+ }
+
+ d.config.randomize = d.cmdOpts.randomize
+
d.config.Cal.Default()
if d.config.Cal.Enabled {
@@ -303,6 +343,10 @@ func (d *SyncTestDriver) Exec() {
var wg sync.WaitGroup
chDone := make(chan bool)
+ var numRunningExecutors util.AtomicCounter
+ numRunningExecutors.Reset()
+ numRunningExecutors.Add(int32(d.config.NumExecutor))
+
if d.config.NumExecutor > 0 {
wg.Add(1)
go func() {
@@ -322,9 +366,14 @@ func (d *SyncTestDriver) Exec() {
case <-ticker.C:
d.movingStats.PrettyPrint(os.Stdout)
d.movingStats.Reset()
+ if numRunningExecutors.Get() == 0 {
+ timer.Stop()
+ ticker.Stop()
+ close(chDone)
+ break loop
+ }
}
}
-
}()
} else {
glog.Errorf("number of executor specified is zero")
@@ -333,15 +382,17 @@ func (d *SyncTestDriver) Exec() {
d.tmStart = time.Now()
d.stats.Init()
d.movingStats.Init()
+ var start int = -1
+ var end int = -1
+
for i := 0; i < d.config.NumExecutor; i++ {
- size := d.cmdOpts.numKeys / 2
- num := size / d.config.NumExecutor
- offGet := i*num + size
+ if d.config.sKey >= 0 && d.config.eKey > d.config.sKey {
+ range_size := (d.config.eKey - d.config.sKey + int64(d.config.NumExecutor-1)) / int64(d.config.NumExecutor)
- if size > MaxDeletes {
- size = MaxDeletes
+ start = i*int(range_size) + int(d.config.sKey)
+ end = start + int(range_size) - 1 //pad
}
- offDel := i * (size / d.config.NumExecutor)
+ //fmt.Printf("s=%d, e=%d\n", start, end)
cli, err := client.New(d.config.Config)
if err != nil {
glog.Error(err)
@@ -350,15 +401,18 @@ func (d *SyncTestDriver) Exec() {
eng := &TestEngine{
rdgen: d.randgen,
recStore: RecordStore{
- numKeys: num,
- offsetDel: offDel,
- offsetGet: offGet},
+ nextKey: int(start),
+ sKey: int(start),
+ eKey: int(end),
+ randomize: d.config.randomize,
+ },
reqSequence: d.reqSequence,
// chDone: chDone,
client: cli,
stats: &d.stats,
movingStats: &d.movingStats,
numReqPerSecond: d.config.NumReqPerSecond,
+ numRunningExec: &numRunningExecutors,
}
eng.Init()
wg.Add(1)
diff --git a/test/drv/junoload/tdscfg.go b/test/drv/junoload/tdscfg.go
index 46fb27e6..2880f270 100644
--- a/test/drv/junoload/tdscfg.go
+++ b/test/drv/junoload/tdscfg.go
@@ -20,9 +20,9 @@
package main
import (
- "juno/pkg/client"
- "juno/pkg/logging/cal/config"
- "juno/pkg/sec"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/sec"
)
type (
@@ -43,5 +43,8 @@ type (
StatOutputRate int
isVariable bool
disableGetTTL bool
+ sKey int64
+ eKey int64
+ randomize bool
}
)
diff --git a/test/drv/junoload/tsteng.go b/test/drv/junoload/tsteng.go
index a9970bfc..8cdd77f8 100644
--- a/test/drv/junoload/tsteng.go
+++ b/test/drv/junoload/tsteng.go
@@ -16,20 +16,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-
package main
import (
"encoding/binary"
+ "errors"
"fmt"
"math"
"math/rand"
"sync"
"time"
- "juno/pkg/client"
+ "github.com/paypal/junodb/pkg/client"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/third_party/forked/golang/glog"
+ "juno/pkg/util"
uuid "github.com/satori/go.uuid"
)
@@ -43,7 +45,7 @@ const (
kNumRequestTypes
)
-const MaxDeletes = 10000
+var ErrNoMoreKeys = errors.New("no more keys")
type (
RequestType uint8
@@ -53,14 +55,11 @@ type (
}
RecordStore struct {
- records []Record
- // Used for preloaded keys
- numKeys int
- currGet int
- nextDelete int
- offsetDel int
- offsetGet int
- LastDelete bool
+ records []Record
+ sKey int
+ eKey int
+ nextKey int
+ randomize bool
}
TestEngine struct {
@@ -73,6 +72,7 @@ type (
stats *Statistics
movingStats *Statistics
numReqPerSecond int
+ numRunningExec *util.AtomicCounter
}
InvokeFunc func() error
)
@@ -128,27 +128,35 @@ func (r *Record) isExpired() bool {
}
func (s *RecordStore) Add(rec Record) {
- if s.numKeys > 0 {
+ if s.isKeyRange() {
return
}
+
s.records = append(s.records, rec)
}
func (s *RecordStore) display() {
- glog.Infof("numKeys=%d currGet=%d nextDelete=%d offsetDel=%d offsetGet=%d",
- s.numKeys, s.currGet, s.nextDelete, s.offsetDel, s.offsetGet)
+ /*
+ glog.Infof("numKeys=%d currGet=%d nextDelete=%d offsetDel=%d offsetGet=%d",
+ s.numKeys, s.currGet, s.nextDelete, s.offsetDel, s.offsetGet)*/
}
func (s *RecordStore) takeRecord() (rec Record, err error) {
- if s.numKeys > 0 { // preloaded keys
- rec = Record{
- key: NewRandomKey(s.offsetDel + s.nextDelete),
+ if s.isKeyRange() {
+ var key_id int
+ if s.randomize {
+ key_id = s.sKey + rand.Intn(s.eKey-s.sKey+1)
+ } else {
+ if s.nextKey > s.eKey {
+ err = ErrNoMoreKeys
+ return
+ }
+ key_id = s.nextKey
+ s.nextKey++
}
- if s.endOfDelete() {
- err = fmt.Errorf("no more record for destroy")
- return
+ rec = Record{
+ key: NewRandomKey(key_id),
}
- s.nextDelete++
return
}
@@ -164,17 +172,23 @@ func (s *RecordStore) takeRecord() (rec Record, err error) {
}
func (s *RecordStore) getRecord() (rec Record, err error) {
- if s.numKeys > 0 { // preloaded keys
- count := s.numKeys
- if s.numKeys >= MaxDeletes {
- count = s.numKeys >> 2
+ if s.isKeyRange() {
+ var key_id int
+ if s.randomize {
+ key_id = s.sKey + rand.Intn(s.eKey-s.sKey+1)
+ } else {
+ if s.nextKey > s.eKey {
+ err = ErrNoMoreKeys
+ return
+ }
+ key_id = s.nextKey
+ s.nextKey++
}
- k := expRand(count)
- s.currGet = k
rec = Record{
- key: NewRandomKey(s.offsetGet + k),
+ key: NewRandomKey(key_id),
}
+
return
}
@@ -193,32 +207,26 @@ func (s *RecordStore) getRecord() (rec Record, err error) {
}
func (s *RecordStore) empty() bool {
- return len(s.records) == 0 && s.numKeys == 0
-}
-
-func (s *RecordStore) endOfDelete() bool {
- return s.numKeys > 0 &&
- (s.nextDelete >= s.numKeys || s.nextDelete >= MaxDeletes)
+ return len(s.records) == 0 && s.isKeyRange() == false
}
func (s *RecordStore) Get() (rec Record, err error) {
for !s.empty() {
rec, err = s.getRecord()
- if err == nil {
- return
- }
+ return
}
err = fmt.Errorf("no record")
return
}
func (s *RecordStore) Take() (rec Record, err error) {
- for !s.empty() && !s.endOfDelete() {
+ if s.isKeyRange() {
+ return s.takeRecord()
+ }
+
+ if !s.empty() {
rec, err = s.takeRecord()
- if err == nil && !rec.isExpired() {
- if s.endOfDelete() {
- s.LastDelete = true
- }
+ if err == nil {
return
}
}
@@ -226,6 +234,23 @@ func (s *RecordStore) Take() (rec Record, err error) {
return
}
+func (s *RecordStore) getNextKey() (key []byte) {
+ if s.sKey == -1 {
+ key = newTestKey()
+ } else {
+ if s.nextKey > s.eKey {
+ return nil
+ }
+ key = NewRandomKey(s.nextKey)
+ s.nextKey++
+ }
+ return
+}
+
+func (s *RecordStore) isKeyRange() bool {
+ return s.sKey > -1
+}
+
func (e *TestEngine) Init() {
e.invokeFuncs = make([]InvokeFunc, kNumRequestTypes)
e.invokeFuncs[kRequestTypeCreate] = e.invokeCreate
@@ -235,70 +260,35 @@ func (e *TestEngine) Init() {
e.invokeFuncs[kRequestTypeDestroy] = e.invokeDestroy
}
-func (e *TestEngine) restoreData() {
- if e.recStore.numKeys <= 0 || e.recStore.nextDelete <= 0 {
- return
- }
-
- count := e.recStore.nextDelete
-
- // Add back deleted keys
- glog.Infof("Add back deleted keys: count=%d", count)
- for i := 0; i < count; i++ {
-
- now := time.Now()
-
- key := NewRandomKey(e.recStore.offsetDel + i)
- _, err := e.client.Create(key, e.rdgen.createPayload())
- tm := time.Since(now)
-
- e.stats.Put(kRequestTypeCreate, tm, err)
- e.movingStats.Put(kRequestTypeCreate, tm, err)
- if err != nil {
- glog.Errorf("%s error: %s", kRequestTypeCreate.String(), err)
- e.recStore.display()
- }
- }
-}
-
func (e *TestEngine) Run(wg *sync.WaitGroup, chDone <-chan bool) {
defer wg.Done()
+ defer e.numRunningExec.Add(-1)
startTime := time.Now()
var numreq int = 0
errCount := 0
+
for {
for _, item := range e.reqSequence.items {
- if e.recStore.numKeys > 0 &&
- item.reqType == kRequestTypeCreate {
- continue
- }
for i := 0; i < item.numRequests; i++ {
select {
case <-chDone:
- e.restoreData()
return
default:
now := time.Now()
err := e.invoke(item.reqType)
tm := time.Since(now)
- if item.reqType == kRequestTypeDestroy &&
- e.recStore.endOfDelete() {
- if e.recStore.LastDelete {
- e.recStore.LastDelete = false
- } else {
- continue
- }
+ if errors.Is(err, ErrNoMoreKeys) {
+ return
}
+
e.stats.Put(item.reqType, tm, err)
e.movingStats.Put(item.reqType, tm, err)
if err != nil {
glog.Errorf("%s error: %s", item.reqType.String(), err)
- if e.recStore.numKeys > 0 {
- e.recStore.display()
- errCount++
- if errCount > 100 {
- return
- }
+ e.recStore.display()
+ errCount++
+ if errCount > 100 {
+ //return
}
}
diff := now.Sub(startTime)
@@ -355,10 +345,13 @@ func (e *TestEngine) checkSpeedForVariableTp(now time.Time, numReq int, startTim
}
func (e *TestEngine) invokeCreate() (err error) {
- if e.recStore.numKeys > 0 {
+
+ key := e.recStore.getNextKey()
+ if key == nil {
+ err = ErrNoMoreKeys
return
}
- key := newTestKey()
+
var ctx client.IContext
if ctx, err = e.client.Create(key, e.rdgen.createPayload(), client.WithTTL(e.rdgen.getTTL())); err == nil {
@@ -405,9 +398,6 @@ func (e *TestEngine) invokeSet() (err error) {
func (e *TestEngine) invokeDestroy() (err error) {
var rec Record
- if e.recStore.endOfDelete() {
- return nil
- }
if rec, err = e.recStore.Take(); err == nil {
err = e.client.Destroy(rec.key)
}
diff --git a/test/fakess/config.go b/test/fakess/config.go
index f6169bca..39521e64 100644
--- a/test/fakess/config.go
+++ b/test/fakess/config.go
@@ -1,23 +1,24 @@
-//
+//
// Copyright 2023 PayPal Inc.
-//
+//
// 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.
-//
-
-// +build
+//
+
+//go:build ignore
+// +build ignore
package main
@@ -25,13 +26,13 @@ import (
"math"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- "juno/pkg/io"
- cal "juno/pkg/logging/cal/config"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ cal "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/util"
)
var Conf = Config{
diff --git a/test/fakess/main.go b/test/fakess/main.go
index cf0c2eba..fd5ef392 100644
--- a/test/fakess/main.go
+++ b/test/fakess/main.go
@@ -1,34 +1,36 @@
-//
+//
// Copyright 2023 PayPal Inc.
-//
+//
// 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.
-//
-
-// +build
+//
+
+//go:build ignore
+// +build ignore
package main
import (
"flag"
- "juno/pkg/logging/cal"
- "juno/pkg/service"
"net"
"strconv"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/service"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/test/fakess/requesthandler.go b/test/fakess/requesthandler.go
index ebc03ab3..837949b5 100644
--- a/test/fakess/requesthandler.go
+++ b/test/fakess/requesthandler.go
@@ -1,34 +1,36 @@
-//
+//
// Copyright 2023 PayPal Inc.
-//
+//
// 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.
-//
-
-// +build
+//
+
+//go:build ignore
+// +build ignore
package main
import (
- "juno/pkg/io"
- _ "juno/pkg/logging"
- "juno/pkg/proto"
"math/rand"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/io"
+ _ "github.com/paypal/junodb/pkg/logging"
+ "github.com/paypal/junodb/pkg/proto"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
//type IRequestHandler interface {
diff --git a/test/functest/create_test.go b/test/functest/create_test.go
index 1e4e261a..206539e0 100644
--- a/test/functest/create_test.go
+++ b/test/functest/create_test.go
@@ -24,11 +24,11 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/pkg/util"
- "juno/test/testutil"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/test/testutil"
)
/***************************************************
diff --git a/test/functest/delete_test.go b/test/functest/delete_test.go
index 0b0dfb6b..6ebb9603 100644
--- a/test/functest/delete_test.go
+++ b/test/functest/delete_test.go
@@ -21,10 +21,11 @@ package functest
import (
// "encoding/hex"
- "juno/pkg/client"
- "juno/test/testutil"
"testing"
"time"
+
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/test/testutil"
)
/************************************************************************
diff --git a/test/functest/get_test.go b/test/functest/get_test.go
index 1a8640fa..2013fd13 100644
--- a/test/functest/get_test.go
+++ b/test/functest/get_test.go
@@ -20,13 +20,14 @@
package functest
import (
- "juno/pkg/client"
- "juno/pkg/util"
- "juno/test/testutil"
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/test/testutil"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
/***********************************************************************
diff --git a/test/functest/set_test.go b/test/functest/set_test.go
index fc333ef9..b7133914 100644
--- a/test/functest/set_test.go
+++ b/test/functest/set_test.go
@@ -20,13 +20,14 @@
package functest
import (
- "juno/pkg/client"
- "juno/test/testutil"
"strconv"
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/test/testutil"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
/*************************************************
diff --git a/test/functest/setup_test.go b/test/functest/setup_test.go
index e5244527..27dd384e 100644
--- a/test/functest/setup_test.go
+++ b/test/functest/setup_test.go
@@ -30,19 +30,19 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
"github.com/BurntSushi/toml"
- "juno/cmd/proxy/config"
- "juno/pkg/client"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/io"
- "juno/pkg/logging/cal"
- "juno/pkg/sec"
- "juno/pkg/util"
- "juno/test/testutil/server"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/logging/cal"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/test/testutil/server"
)
var testConfig = server.ClusterConfig{
diff --git a/test/functest/update_test.go b/test/functest/update_test.go
index 28697e15..bbc4eed4 100644
--- a/test/functest/update_test.go
+++ b/test/functest/update_test.go
@@ -24,10 +24,10 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/test/testutil"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/test/testutil"
)
/****************************************************
diff --git a/test/mockss/mockss.go b/test/mockss/mockss.go
index e1d87588..bc22f2fb 100644
--- a/test/mockss/mockss.go
+++ b/test/mockss/mockss.go
@@ -22,8 +22,9 @@ package main
import (
"flag"
"fmt"
- "juno/test/testutil/mock"
- "juno/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/test/testutil/mock"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
func main() {
diff --git a/test/testutil/log/frwk/frwk.go b/test/testutil/log/frwk/frwk.go
index 63b55fae..55570efa 100644
--- a/test/testutil/log/frwk/frwk.go
+++ b/test/testutil/log/frwk/frwk.go
@@ -20,7 +20,7 @@
package frwk
import (
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var (
diff --git a/test/testutil/mock/client.go b/test/testutil/mock/client.go
index 9cedae1e..189ab15c 100644
--- a/test/testutil/mock/client.go
+++ b/test/testutil/mock/client.go
@@ -26,11 +26,11 @@ import (
"net"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/pkg/cluster"
- "juno/pkg/proto"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/proto"
)
type MockClient struct {
diff --git a/test/testutil/mock/common.go b/test/testutil/mock/common.go
index 1d6184ed..9d203733 100644
--- a/test/testutil/mock/common.go
+++ b/test/testutil/mock/common.go
@@ -26,7 +26,7 @@ import (
"testing"
"time"
- . "juno/pkg/proto"
+ . "github.com/paypal/junodb/pkg/proto"
)
const (
diff --git a/test/testutil/mock/config.go b/test/testutil/mock/config.go
index 93a98c75..dcd03d5c 100644
--- a/test/testutil/mock/config.go
+++ b/test/testutil/mock/config.go
@@ -23,9 +23,9 @@ import (
"math"
"time"
- "juno/pkg/io"
- "juno/pkg/service"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/util"
)
type SSConfig struct {
diff --git a/test/testutil/mock/ssreqhandler.go b/test/testutil/mock/ssreqhandler.go
index c5942b06..40d4d86a 100644
--- a/test/testutil/mock/ssreqhandler.go
+++ b/test/testutil/mock/ssreqhandler.go
@@ -25,13 +25,13 @@ import (
"sync"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- // "juno/cmd/proxy/handler"
- "juno/pkg/io"
- "juno/pkg/proto"
- "juno/pkg/service"
- "juno/pkg/util"
+ // "github.com/paypal/junodb/cmd/proxy/handler"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/pkg/util"
)
var _ io.IRequestHandler = (*RequestHandler)(nil)
diff --git a/test/testutil/server/cluster.go b/test/testutil/server/cluster.go
index 4467ef7e..1d9d287b 100644
--- a/test/testutil/server/cluster.go
+++ b/test/testutil/server/cluster.go
@@ -31,16 +31,16 @@ import (
"syscall"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/handler"
- "juno/cmd/proxy/stats"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/net/netutil"
- "juno/pkg/util"
- "juno/test/testutil/log/frwk"
- "juno/test/testutil/mock"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/handler"
+ "github.com/paypal/junodb/cmd/proxy/stats"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/net/netutil"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/test/testutil/log/frwk"
+ "github.com/paypal/junodb/test/testutil/mock"
)
type ICluster interface {
diff --git a/test/testutil/server/config.go b/test/testutil/server/config.go
index dde5a67f..9899ac15 100644
--- a/test/testutil/server/config.go
+++ b/test/testutil/server/config.go
@@ -20,11 +20,11 @@
package server
import (
- "juno/cmd/proxy/config"
- "juno/pkg/io"
- cal "juno/pkg/logging/cal/config"
- "juno/pkg/sec"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/io"
+ cal "github.com/paypal/junodb/pkg/logging/cal/config"
+ "github.com/paypal/junodb/pkg/sec"
+ "github.com/paypal/junodb/pkg/util"
)
type ServerDef struct {
diff --git a/test/testutil/server/inprocsrv.go b/test/testutil/server/inprocsrv.go
index 69ef735b..217c14d7 100644
--- a/test/testutil/server/inprocsrv.go
+++ b/test/testutil/server/inprocsrv.go
@@ -23,10 +23,10 @@ import (
"fmt"
"sync"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/service"
- "juno/test/testutil/log/frwk"
+ "github.com/paypal/junodb/pkg/service"
+ "github.com/paypal/junodb/test/testutil/log/frwk"
)
var _ IServer = (*InProcessServer)(nil)
diff --git a/test/testutil/server/server.go b/test/testutil/server/server.go
index 88871815..9f1c0c10 100644
--- a/test/testutil/server/server.go
+++ b/test/testutil/server/server.go
@@ -22,7 +22,6 @@ package server
import (
"fmt"
pkgio "io"
- "juno/third_party/forked/golang/glog"
"net"
"net/http"
"os"
@@ -31,11 +30,13 @@ import (
"strings"
"time"
- "juno/internal/cli"
- "juno/pkg/io"
- "juno/pkg/net/netutil"
- "juno/pkg/proto"
- "juno/test/testutil/log/frwk"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/net/netutil"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil/log/frwk"
)
const (
diff --git a/test/testutil/server/ssnode.go b/test/testutil/server/ssnode.go
index dcd2994a..105d0469 100644
--- a/test/testutil/server/ssnode.go
+++ b/test/testutil/server/ssnode.go
@@ -23,10 +23,10 @@ import (
"fmt"
"net"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/test/testutil/ssclient"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/test/testutil/ssclient"
)
type SSNode struct {
diff --git a/test/testutil/ssclient/advssclient.go b/test/testutil/ssclient/advssclient.go
index 876e69e7..ffe0abfe 100644
--- a/test/testutil/ssclient/advssclient.go
+++ b/test/testutil/ssclient/advssclient.go
@@ -24,11 +24,11 @@ import (
"net"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/pkg/etcd"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type Config struct {
diff --git a/test/testutil/ssclient/ssclient.go b/test/testutil/ssclient/ssclient.go
index 273704e0..a5a4b82a 100644
--- a/test/testutil/ssclient/ssclient.go
+++ b/test/testutil/ssclient/ssclient.go
@@ -24,12 +24,12 @@ import (
"io"
"net"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/internal/cli"
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/pkg/util"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/pkg/util"
)
type Record struct {
diff --git a/test/testutil/testhelper.go b/test/testutil/testhelper.go
index 537e36ee..7ac9b6cc 100644
--- a/test/testutil/testhelper.go
+++ b/test/testutil/testhelper.go
@@ -34,17 +34,17 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
-
- "juno/cmd/proxy/config"
- "juno/internal/cli"
- "juno/pkg/client"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/io"
- "juno/pkg/util"
- "juno/test/testutil/mock"
- "juno/test/testutil/server"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
+
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/internal/cli"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
+ "github.com/paypal/junodb/test/testutil/mock"
+ "github.com/paypal/junodb/test/testutil/server"
)
type KVMap map[string]string
@@ -227,7 +227,7 @@ func ApproxEqual(v1 uint32, v2 uint32, epsilon uint32) bool {
return (v2 - v1) <= epsilon
}
-//This function has to be called right after getting RecordInfo
+// This function has to be called right after getting RecordInfo
func VerifyRecordInfo(recInfo client.IContext, ver uint32, ttl uint32, creationTime uint32) error {
if recInfo == nil {
return fmt.Errorf("nil recInfo")
@@ -958,7 +958,7 @@ func LoadInitConfig(hostip string) {
time.Sleep(3 * time.Second)
}
-//temporally create redist info
+// temporally create redist info
func UpdateRedistConfig(t *testing.T, hostip string, connNo string, configFile string) {
var cmd string
var cmd1 string
@@ -989,7 +989,7 @@ func UpdateRedistConfig(t *testing.T, hostip string, connNo string, configFile s
time.Sleep(3 * time.Second)
}
-//start redist
+// start redist
func StartRedistConfig(t *testing.T, hostip string, markdown string) {
var localIp bool = false
var cmd string
@@ -1009,7 +1009,7 @@ func StartRedistConfig(t *testing.T, hostip string, markdown string) {
}
}
-//start auto redistribution
+// start auto redistribution
func StartAutoRedistConfig(t *testing.T, hostip string, markdown string) {
var localIp bool = false
var cmd string
@@ -1027,7 +1027,7 @@ func StartAutoRedistConfig(t *testing.T, hostip string, markdown string) {
exec.Command("bash", "-c", cmd).Output()
}
-//temporally check forward finish, all zones are snapshot_finish
+// temporally check forward finish, all zones are snapshot_finish
func FinishForwardCheck(t *testing.T, hostip string) {
var cmd string
if ResolveHostIp() != hostip {
@@ -1044,7 +1044,7 @@ func FinishForwardCheck(t *testing.T, hostip string) {
}
}
-//resume the aborted redistribution
+// resume the aborted redistribution
func ResumeAbortedReq(t *testing.T, hostip string) {
var cmd string
if ResolveHostIp() != hostip {
@@ -1058,7 +1058,7 @@ func ResumeAbortedReq(t *testing.T, hostip string) {
exec.Command("bash", "-c", cmd).Output()
}
-//commit the new change
+// commit the new change
func FinalizeConfig(t *testing.T, hostip string) {
var cmd string
if ResolveHostIp() != hostip {
@@ -1164,7 +1164,7 @@ func ReInitializeCluster(config server.ClusterConfig) (c *server.Cluster) {
return server.NewClusterWithConfig(&config)
}
-//This definitely will be deleted as it's a temporally workaround for shutdown issue
+// This definitely will be deleted as it's a temporally workaround for shutdown issue
func SSShutdown(hostip string, secondhost bool) {
var cmd string
if ResolveHostIp() != hostip {
diff --git a/test/testutil/tmkeeper.go b/test/testutil/tmkeeper.go
index ee269605..622a0171 100644
--- a/test/testutil/tmkeeper.go
+++ b/test/testutil/tmkeeper.go
@@ -22,7 +22,7 @@ package testutil
import (
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
type timeKeeper struct {
diff --git a/test/unittest/create_test.go b/test/unittest/create_test.go
index 7a78105f..d49974f4 100644
--- a/test/unittest/create_test.go
+++ b/test/unittest/create_test.go
@@ -21,14 +21,15 @@ package unittest
import (
"fmt"
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/test/testutil"
- "juno/test/testutil/mock"
"strconv"
"testing"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
+ "github.com/paypal/junodb/test/testutil/mock"
+
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
)
var createStatusArray [7]uint8
diff --git a/test/unittest/destroy_test.go b/test/unittest/destroy_test.go
index baf68e68..f43b7854 100644
--- a/test/unittest/destroy_test.go
+++ b/test/unittest/destroy_test.go
@@ -1,29 +1,28 @@
+// Copyright 2023 PayPal Inc.
//
-// Copyright 2023 PayPal Inc.
+// 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
//
-// 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.
+// 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 unittest
import (
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/test/testutil"
- "juno/test/testutil/mock"
"testing"
+
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
+ "github.com/paypal/junodb/test/testutil/mock"
)
var prepareDeleteArr [4]uint8
diff --git a/test/unittest/get_test.go b/test/unittest/get_test.go
index de355260..3235a8b9 100644
--- a/test/unittest/get_test.go
+++ b/test/unittest/get_test.go
@@ -20,11 +20,12 @@
package unittest
import (
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/test/testutil"
- "juno/test/testutil/mock"
"testing"
+
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
+ "github.com/paypal/junodb/test/testutil/mock"
)
var getStatusArray [5]uint8
diff --git a/test/unittest/set_test.go b/test/unittest/set_test.go
index 2981117b..b961176e 100644
--- a/test/unittest/set_test.go
+++ b/test/unittest/set_test.go
@@ -20,11 +20,12 @@
package unittest
import (
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/test/testutil"
- "juno/test/testutil/mock"
"testing"
+
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
+ "github.com/paypal/junodb/test/testutil/mock"
)
var setPrepareArray [7]uint8
diff --git a/test/unittest/setup_test.go b/test/unittest/setup_test.go
index f7541e9a..a7881275 100644
--- a/test/unittest/setup_test.go
+++ b/test/unittest/setup_test.go
@@ -28,17 +28,17 @@ import (
"testing"
"time"
- "juno/third_party/forked/golang/glog"
+ "github.com/paypal/junodb/third_party/forked/golang/glog"
- "juno/cmd/proxy/config"
- "juno/pkg/client"
- "juno/pkg/cluster"
- "juno/pkg/etcd"
- "juno/pkg/io"
- "juno/pkg/util"
+ "github.com/paypal/junodb/cmd/proxy/config"
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/cluster"
+ "github.com/paypal/junodb/pkg/etcd"
+ "github.com/paypal/junodb/pkg/io"
+ "github.com/paypal/junodb/pkg/util"
- "juno/test/testutil/mock"
- "juno/test/testutil/server"
+ "github.com/paypal/junodb/test/testutil/mock"
+ "github.com/paypal/junodb/test/testutil/server"
)
var testConfig = server.ClusterConfig{
diff --git a/test/unittest/update_test.go b/test/unittest/update_test.go
index 4f74b5e6..d8b0ef4f 100644
--- a/test/unittest/update_test.go
+++ b/test/unittest/update_test.go
@@ -20,12 +20,13 @@
package unittest
import (
- //"juno/third_party/forked/golang/glog"
- "juno/pkg/client"
- "juno/pkg/proto"
- "juno/test/testutil"
- "juno/test/testutil/mock"
+ //"github.com/paypal/junodb/third_party/forked/golang/glog"
"testing"
+
+ "github.com/paypal/junodb/pkg/client"
+ "github.com/paypal/junodb/pkg/proto"
+ "github.com/paypal/junodb/test/testutil"
+ "github.com/paypal/junodb/test/testutil/mock"
)
var updatePrepareArray [6]uint8